summaryrefslogtreecommitdiff
path: root/src/client/Client.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-11-26 10:34:17 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-11-26 10:34:17 (GMT)
commitb08812569cf96dcd5a62c8d0467bd14f3ae90e54 (patch)
tree98375c0ba26212c04cb9ff0ea183f6b3066dd659 /src/client/Client.cpp
parent6a4040f2b7aa86992a340f8bf5afb95011a1e989 (diff)
downloadpowder-b08812569cf96dcd5a62c8d0467bd14f3ae90e54.zip
powder-b08812569cf96dcd5a62c8d0467bd14f3ae90e54.tar.gz
Stop using persistent connections when we don't need them. Force shutdown of Thumbnailbroker before http lib close, fixes #84
Diffstat (limited to 'src/client/Client.cpp')
-rw-r--r--src/client/Client.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index 67a018b..fb14050 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -140,7 +140,7 @@ void Client::Initialise(std::string proxyString)
stampsLib.close();
//Begin version check
- versionCheckRequest = http_async_req_start(NULL, SERVER "/Startup.json", NULL, 0, 1);
+ versionCheckRequest = http_async_req_start(NULL, SERVER "/Startup.json", NULL, 0, 0);
if(authUser.ID)
{
@@ -720,6 +720,7 @@ void Client::WritePrefs()
void Client::Shutdown()
{
+ ThumbnailBroker::Ref().Shutdown();
ClearThumbnailRequests();
http_done();
@@ -1827,7 +1828,7 @@ Thumbnail * Client::GetThumbnail(int saveID, int saveDate)
{
if(!activeThumbRequests[i])
{
- activeThumbRequests[i] = http_async_req_start(NULL, (char *)urlStream.str().c_str(), NULL, 0, 1);
+ activeThumbRequests[i] = http_async_req_start(NULL, (char *)urlStream.str().c_str(), NULL, 0, 0);
activeThumbRequestTimes[i] = currentTime;
activeThumbRequestCompleteTimes[i] = 0;
activeThumbRequestIDs[i] = idString;