Merge branch 'develop' of github.com:OpenEducationFoundation/OpenBoard into develop

preferencesAboutTextFull
-f 11 years ago
commit 93730c58c5
  1. 7
      src/core/UBApplicationController.cpp

@ -482,7 +482,7 @@ void UBApplicationController::showDesktop(bool dontSwitchFrontProcess)
void UBApplicationController::checkUpdate(QString urlString) void UBApplicationController::checkUpdate(QString urlString)
{ {
if(mHttp) if(mHttp)
delete mHttp; mHttp->deleteLater();
QUrl url(urlString); QUrl url(urlString);
mHttp = new QHttp(url.host()); mHttp = new QHttp(url.host());
connect(mHttp, SIGNAL(requestFinished(int,bool)), this, SLOT(updateRequestFinished(int,bool))); connect(mHttp, SIGNAL(requestFinished(int,bool)), this, SLOT(updateRequestFinished(int,bool)));
@ -503,14 +503,15 @@ void UBApplicationController::updateHeaderReceived(QHttpResponseHeader header)
void UBApplicationController::updateRequestFinished(int id, bool error) void UBApplicationController::updateRequestFinished(int id, bool error)
{ {
if (error){ if (error){
qWarning() << "http command id" << id << "return the error: " << mHttp->errorString(); qWarning() << "http command id" << id << "return an error";
mHttp->close();
} }
else{ else{
QString responseString = QString(mHttp->readAll()); QString responseString = QString(mHttp->readAll());
qDebug() << responseString; qDebug() << responseString;
if (!responseString.isEmpty() && responseString.contains("version") && responseString.contains("url")){ if (!responseString.isEmpty() && responseString.contains("version") && responseString.contains("url")){
mHttp->close(); mHttp->close();
mHttp->deleteLater();
mHttp = 0;
downloadJsonFinished(responseString); downloadJsonFinished(responseString);
} }
} }

Loading…
Cancel
Save