diff options
| author | jacob1 <jfu614@gmail.com> | 2013-03-23 14:55:06 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-03-23 14:55:06 (GMT) |
| commit | 6bf98ccdca39936a3c51367862eed7c49f8786ec (patch) | |
| tree | bf33ca592571ce832ae915928192b6902fc08e4a /src/client/Client.cpp | |
| parent | c50e12df28fd069933359026a527ba0c401447de (diff) | |
| parent | 2c311b9a36a88fadd96f3d39acb1ab2590835d81 (diff) | |
| download | powder-6bf98ccdca39936a3c51367862eed7c49f8786ec.zip powder-6bf98ccdca39936a3c51367862eed7c49f8786ec.tar.gz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/client/Client.cpp')
| -rw-r--r-- | src/client/Client.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/Client.cpp b/src/client/Client.cpp index ef457b9..22490a1 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) { @@ -643,7 +643,7 @@ void Client::Tick() if(data) free(data); } - else + else if(data) { std::istringstream dataStream(data); |