[Scummvm-git-logs] scummvm master -> cdbcb296090cd0c5ff8c6a04b7184e7b45b7188a

rsn8887 rsn8887 at users.noreply.github.com
Sun Oct 13 21:19:27 CEST 2019


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cdbcb29609 SWITCH: Fix cloud integration


Commit: cdbcb296090cd0c5ff8c6a04b7184e7b45b7188a
    https://github.com/scummvm/scummvm/commit/cdbcb296090cd0c5ff8c6a04b7184e7b45b7188a
Author: rsn8887 (rsn8887 at users.noreply.github.com)
Date: 2019-10-13T14:19:05-05:00

Commit Message:
SWITCH: Fix cloud integration

Changed paths:
    backends/networking/curl/networkreadstream.cpp
    backends/platform/sdl/switch/switch-main.cpp


diff --git a/backends/networking/curl/networkreadstream.cpp b/backends/networking/curl/networkreadstream.cpp
index dee4885..be97794 100644
--- a/backends/networking/curl/networkreadstream.cpp
+++ b/backends/networking/curl/networkreadstream.cpp
@@ -84,6 +84,9 @@ void NetworkReadStream::init(const char *url, curl_slist *headersList, const byt
 	curl_easy_setopt(_easy, CURLOPT_NOPROGRESS, 0L);
 	curl_easy_setopt(_easy, CURLOPT_PROGRESSFUNCTION, curlProgressCallbackOlder);
 	curl_easy_setopt(_easy, CURLOPT_PROGRESSDATA, this);
+#ifdef NINTENDO_SWITCH
+	curl_easy_setopt(_easy, CURLOPT_SSL_VERIFYPEER, 0);
+#endif
 #if LIBCURL_VERSION_NUM >= 0x072000
 	// CURLOPT_XFERINFOFUNCTION introduced in libcurl 7.32.0
 	// CURLOPT_PROGRESSFUNCTION is used as a backup plan in case older version is used
@@ -136,6 +139,9 @@ void NetworkReadStream::init(const char *url, curl_slist *headersList, Common::H
 	curl_easy_setopt(_easy, CURLOPT_NOPROGRESS, 0L);
 	curl_easy_setopt(_easy, CURLOPT_PROGRESSFUNCTION, curlProgressCallbackOlder);
 	curl_easy_setopt(_easy, CURLOPT_PROGRESSDATA, this);
+#ifdef NINTENDO_SWITCH
+	curl_easy_setopt(_easy, CURLOPT_SSL_VERIFYPEER, 0);
+#endif
 #if LIBCURL_VERSION_NUM >= 0x072000
 	// CURLOPT_XFERINFOFUNCTION introduced in libcurl 7.32.0
 	// CURLOPT_PROGRESSFUNCTION is used as a backup plan in case older version is used
diff --git a/backends/platform/sdl/switch/switch-main.cpp b/backends/platform/sdl/switch/switch-main.cpp
index 0cc48ba..71d80c1 100644
--- a/backends/platform/sdl/switch/switch-main.cpp
+++ b/backends/platform/sdl/switch/switch-main.cpp
@@ -29,8 +29,8 @@
 
 int main(int argc, char *argv[]) {
 
-#ifdef __SWITCH_DEBUG__
 	socketInitializeDefault();
+#ifdef __SWITCH_DEBUG__
 	nxlinkStdio();
 #endif
 
@@ -51,9 +51,7 @@ int main(int argc, char *argv[]) {
 	// Free OSystem
 	g_system->destroy();
 
-#ifdef __SWITCH_DEBUG__
 	socketExit();
-#endif
 
 	return res;
 }





More information about the Scummvm-git-logs mailing list