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

Fix dumb things that aren't necessarily lethal but are eyesores

Browse Source
This commit is contained in:
Tamás Bálint Misius 2019-03-10 09:07:02 +01:00 committed by jacob1
parent 2e17b848b1
commit 3d22c1ed4e
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/client/Client.cpp
View File

@ -732,7 +732,7 @@ bool Client::CheckUpdate(http::Request *updateRequest, bool checkSession)
} }
else if(data.size()) else if(data.size())
{ {
std::istringstream dataStream(data.c_str()); std::istringstream dataStream(data);
try try
{ {
@ -912,14 +912,6 @@ void Client::WritePrefs()
} }
void Client::Shutdown() void Client::Shutdown()
{
http::RequestManager::Ref().Shutdown();
//Save config
WritePrefs();
}
Client::~Client()
{ {
if (versionCheckRequest) if (versionCheckRequest)
{ {
@ -929,6 +921,15 @@ Client::~Client()
{ {
alternateVersionCheckRequest->Cancel(); alternateVersionCheckRequest->Cancel();
} }
http::RequestManager::Ref().Shutdown();
//Save config
WritePrefs();
}
Client::~Client()
{
} }
@ -1254,7 +1255,7 @@ LoginStatus Client::Login(ByteString username, ByteString password, User & user)
{ {
try try
{ {
std::istringstream dataStream(data.c_str()); std::istringstream dataStream(data);
Json::Value objDocument; Json::Value objDocument;
dataStream >> objDocument; dataStream >> objDocument;

4
src/gui/preview/PreviewModel.cpp
View File

@ -199,7 +199,7 @@ bool PreviewModel::ParseSaveInfo(ByteString &saveInfoResponse)
try try
{ {
std::istringstream dataStream(saveInfoResponse.c_str()); std::istringstream dataStream(saveInfoResponse);
Json::Value objDocument; Json::Value objDocument;
dataStream >> objDocument; dataStream >> objDocument;
@ -257,7 +257,7 @@ bool PreviewModel::ParseComments(ByteString &commentsResponse)
saveComments = new std::vector<SaveComment*>(); saveComments = new std::vector<SaveComment*>();
try try
{ {
std::istringstream dataStream(commentsResponse.c_str()); std::istringstream dataStream(commentsResponse);
Json::Value commentsArray; Json::Value commentsArray;
dataStream >> commentsArray; dataStream >> commentsArray;