From 700aff478480588618da4f2ec52133608950ebf8 Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Fri, 22 Mar 2013 13:20:54 +0000 Subject: [PATCH 1/2] Don't try to parse update check response if it's NULL! --- src/client/Client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/Client.cpp b/src/client/Client.cpp index ef457b92f..05ae12905 100644 --- a/src/client/Client.cpp +++ b/src/client/Client.cpp @@ -643,7 +643,7 @@ void Client::Tick() if(data) free(data); } - else + else if(data) { std::istringstream dataStream(data); From 2c311b9a36a88fadd96f3d39acb1ab2590835d81 Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Fri, 22 Mar 2013 13:40:54 +0000 Subject: [PATCH 2/2] Use "http://" for update/startup check --- src/client/Client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/Client.cpp b/src/client/Client.cpp index 05ae12905..22490a1a7 100644 --- a/src/client/Client.cpp +++ b/src/client/Client.cpp @@ -144,7 +144,7 @@ void Client::Initialise(std::string proxyString) stampsLib.close(); //Begin version check - versionCheckRequest = http_async_req_start(NULL, SERVER "/Startup.json", NULL, 0, 0); + versionCheckRequest = http_async_req_start(NULL, "http://" SERVER "/Startup.json", NULL, 0, 0); if(authUser.ID) {