noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

fixed compilation

Browse source
This commit is contained in:
fourtf 2018-07-07 12:03:37 +02:00
parent c609a9fd37
commit 6bf7ba1ebe
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/NetworkRequest.cpp
View file

@ -27,7 +27,7 @@ NetworkRequest::NetworkRequest(QUrl url, NetworkRequestType requestType)
NetworkRequest::~NetworkRequest() NetworkRequest::~NetworkRequest()
{ {
assert(this->executed_); // assert(this->executed_);
} }
void NetworkRequest::setRequestType(NetworkRequestType newRequestType) void NetworkRequest::setRequestType(NetworkRequestType newRequestType)

12
src/singletons/Updates.cpp
View file

@ -2,6 +2,7 @@
#include "common/NetworkRequest.hpp" #include "common/NetworkRequest.hpp"
#include "common/Version.hpp" #include "common/Version.hpp"
#include "singletons/Paths.hpp"
#include "util/CombinePath.hpp" #include "util/CombinePath.hpp"
#include "util/PostToThread.hpp" #include "util/PostToThread.hpp"
@ -65,8 +66,10 @@ void Updates::installUpdates()
return true; return true;
}); });
req.get([this](QByteArray &object) {
auto filename = combinePath(getApp()->paths->miscDirectory, "update.zip"); req.onSuccess([this](auto result) -> bool {
QByteArray object = result.getData();
auto filename = combinePath(getPaths()->miscDirectory, "update.zip");
QFile file(filename); QFile file(filename);
file.open(QIODevice::Truncate | QIODevice::WriteOnly); file.open(QIODevice::Truncate | QIODevice::WriteOnly);
@ -95,7 +98,7 @@ void Updates::checkForUpdates()
NetworkRequest req(url); NetworkRequest req(url);
req.setTimeout(30000); req.setTimeout(30000);
req.onSuccess([this](auto result) { req.onSuccess([this](auto result) -> bool {
auto object = result.parseJson(); auto object = result.parseJson();
QJsonValue version_val = object.value("version"); QJsonValue version_val = object.value("version");
QJsonValue update_val = object.value("update"); QJsonValue update_val = object.value("update");
@ -113,7 +116,7 @@ void Updates::checkForUpdates()
box->show(); box->show();
box->raise(); box->raise();
}); });
return; return false;
} }
this->onlineVersion_ = version_val.toString(); this->onlineVersion_ = version_val.toString();
@ -137,6 +140,7 @@ void Updates::checkForUpdates()
} else { } else {
this->setStatus_(NoUpdateAvailable); this->setStatus_(NoUpdateAvailable);
} }
return false;
}); });
this->setStatus_(Searching); this->setStatus_(Searching);
req.execute(); req.execute();