From 7583602d649dd1b474d4c2706164bfab067f179f Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sun, 18 Dec 2011 17:58:10 +1000 Subject: [PATCH] Fix update check crash on Linux build --- UpdaterWindow.cpp | 4 ++-- main.cpp | 3 +-- mainwindow.cpp | 54 +++++------------------------------------------ mainwindow.h | 3 --- 4 files changed, 8 insertions(+), 56 deletions(-) diff --git a/UpdaterWindow.cpp b/UpdaterWindow.cpp index 0141adac..7f5b62e1 100644 --- a/UpdaterWindow.cpp +++ b/UpdaterWindow.cpp @@ -189,8 +189,9 @@ void UpdaterWindow::ParseUpdateXML(QIODevice * dev) } else release=NULL; } if (!release || (VersionString() > release->version)) { - mainwin->Notify("No updates were found for your platform",5000,"SleepyHead Updates"); + mainwin->Notify("No updates were found for your platform.",5000,"SleepyHead Updates"); close(); + return; } @@ -474,7 +475,6 @@ void UpdaterWindow::upgradeNext() ui->FinishedButton->setVisible(true); ui->downloadLabel->setText("Updates Complete. SleepyHead needs to restart now, click Finished to do so."); PREF["Updates_LastChecked"]=QDateTime::currentDateTime(); - PREF["VersionString"]=release->version; } else { ui->downloadTitle->setText("Update Failed :("); success=false; diff --git a/main.cpp b/main.cpp index 7e7f97c8..c54c60ce 100644 --- a/main.cpp +++ b/main.cpp @@ -147,8 +147,7 @@ int main(int argc, char *argv[]) } else { if (PREF.Exists("VersionString")) { QString V=PREF["VersionString"].toString(); - if (V!=Version) { - + if (VersionString()>V) { release_notes(); //QMessageBox::warning(0,"New Version Warning","This is a new version of SleepyHead. If you experience a crash right after clicking Ok, you will need to manually delete the SleepApp folder (it's located in your Documents folder) and reimport your data. After this things should work normally.",QMessageBox::Ok); check_updates=false; diff --git a/mainwindow.cpp b/mainwindow.cpp index ca719f30..5ef7adfe 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -71,7 +71,7 @@ MainWindow::MainWindow(QWidget *parent) : logtime.start(); ui->setupUi(this); - QString version=PREF["VersionString"].toString(); + QString version=VersionString(); if (QString(GIT_BRANCH)!="master") version+=QString(" ")+QString(GIT_BRANCH); this->setWindowTitle(tr("SleepyHead")+QString(" v%1 (Profile: %2)").arg(version).arg(PREF["Profile"].toString())); ui->tabWidget->setCurrentIndex(0); @@ -140,17 +140,17 @@ MainWindow::MainWindow(QWidget *parent) : ui->tabWidget->setCurrentWidget(ui->welcome); - netmanager = new QNetworkAccessManager(this); + /*netmanager = new QNetworkAccessManager(this); connect(netmanager, SIGNAL(finished(QNetworkReply*)), this, SLOT(replyFinished(QNetworkReply*))); - connect(ui->webView, SIGNAL(statusBarMessage(QString)), this, SLOT(updatestatusBarMessage(QString))); + connect(ui->webView, SIGNAL(statusBarMessage(QString)), this, SLOT(updatestatusBarMessage(QString))); */ if (QSystemTrayIcon::isSystemTrayAvailable() && QSystemTrayIcon::supportsMessages()) { systray=new QSystemTrayIcon(QIcon(":/docs/sheep.png"),this); systray->show(); systraymenu=new QMenu(this); systray->setContextMenu(systraymenu); - QAction *a=systraymenu->addAction("SleepyHead v"+PREF["VersionString"].toString()); + QAction *a=systraymenu->addAction("SleepyHead v"+VersionString()); a->setEnabled(false); systraymenu->addSeparator(); systraymenu->addAction("About",this,SLOT(on_action_About_triggered())); @@ -511,7 +511,6 @@ void MainWindow::on_oximetryButton_clicked() void MainWindow::CheckForUpdates() { - //QTimer::singleShot(100,this,SLOT(on_actionCheck_for_Updates_triggered())); on_actionCheck_for_Updates_triggered(); } @@ -519,53 +518,10 @@ void MainWindow::on_actionCheck_for_Updates_triggered() { UpdaterWindow *w=new UpdaterWindow(this); w->checkForUpdates(); - -// if (PREF.Exists("Updates_LastChecked")) { -// if (PREF["Updates_LastChecked"].toDateTime().secsTo(QDateTime::currentDateTime())<7200) { -// // Instead of doing this, just use the cached crud -// if (prefdialog) prefdialog->RefreshLastChecked(); -// mainwin->Notify("No New Updates - You already checked recently..."); -// return; -// } -// } -// mainwin->Notify("Checking for Updates"); -// netmanager->get(QNetworkRequest(QUrl("http://sleepyhead.sourceforge.net/current_version.txt"))); -} -void MainWindow::replyFinished(QNetworkReply * reply) -{ - if (reply->error()==QNetworkReply::NoError) { - // Wrap this crap in XML/JSON so can do other stuff. - if (reply->size()>20) { - mainwin->Notify("Update check failed.. Version file on the server is broken."); - } else { - // check in size - QByteArray data=reply->readAll(); - QString a=data; - a=a.trimmed(); - PREF["Updates_LastChecked"]=QDateTime::currentDateTime(); - if (prefdialog) prefdialog->RefreshLastChecked(); - if (a>PREF["VersionString"].toString()) { - if (QMessageBox::question(this,"New Version","A newer version of SleepyHead is available, v"+a+".\nWould you like to update?",QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes) { - QString fileurl="http://sourceforge.net/projects/sleepyhead/files/"; - QString msg="

Sorry, I haven't implemented the auto-update yet

"; - msg+="Click Here for a link to the latest version"; - msg+=""; - - QMessageBox::information(this,"Laziness Warning",msg,QMessageBox::Ok); - } - } else { - mainwin->Notify("Checked for Updates: SleepyHead is already up to date!"); - } - } - } else { - mainwin->Notify("Couldn't check for updates. The network is down.\n\n("+reply->errorString()+")"); - } - reply->deleteLater(); } void MainWindow::on_action_Screenshot_triggered() { - QTimer::singleShot(250,this,SLOT(DelayedScreenshot())); } void MainWindow::DelayedScreenshot() @@ -769,7 +725,7 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date) float vscale=pxres.height()/pres.height(); QFontMetrics fm(*bigfont); - float title_height=fm.ascent()*vscale; + //float title_height=fm.ascent()*vscale; QFontMetrics fm2(*defaultfont); float normal_height=fm2.ascent()*vscale; diff --git a/mainwindow.h b/mainwindow.h index bc6ba1a3..027575b0 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -92,7 +92,6 @@ private slots: void on_actionCheck_for_Updates_triggered(); - void replyFinished(QNetworkReply*); void on_action_Screenshot_triggered(); void DelayedScreenshot(); @@ -127,8 +126,6 @@ private: Overview * overview; Oximetry * oximetry; bool first_load; - //Profile *profile; - QNetworkAccessManager *netmanager; PreferencesDialog *prefdialog; QMutex loglock,strlock; QStringList logbuffer;