matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
jacob1 2013-03-23 10:55:06 -04:00
commit 6bf98ccdca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/Client.cpp
View File

@ -144,7 +144,7 @@ void Client::Initialise(std::string proxyString)
stampsLib.close(); stampsLib.close();
//Begin version check //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) if(authUser.ID)
{ {
@ -643,7 +643,7 @@ void Client::Tick()
if(data) if(data)
free(data); free(data);
} }
else else if(data)
{ {
std::istringstream dataStream(data); std::istringstream dataStream(data);