diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html index fec4cf0e..d59b9cea 100644 --- a/Htmldocs/release_notes.html +++ b/Htmldocs/release_notes.html @@ -11,7 +11,7 @@ For other languages, go to:
http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes

- Changes and fixes in OSCAR v1.2.0-beta-XXX + Changes and fixes in OSCAR v1.2.0-beta-3
Portions of OSCAR are © 2019-2020 by The OSCAR Team

  • [fix] Improve support of rare Philips Respironics 1030X events and update warnings.
  • +
  • [fix] Profile page and Daily records block now shows most recently used machine when a profile has multiple machines.
  • +
  • [fix] Corrected error in beta-1and 2 where date last imported was lost.
  • +
  • [fix] Translations updated.
  • Changes and fixes in OSCAR v1.2.0-beta-2 diff --git a/oscar/VERSION b/oscar/VERSION index 40d79cd1..ba9015f9 100644 --- a/oscar/VERSION +++ b/oscar/VERSION @@ -1,5 +1,5 @@ // Update the string below to set OSCAR's version and release status. // See https://semver.org/spec/v2.0.0.html for details on format. -#define VERSION "1.2.0-beta-2" +#define VERSION "1.2.0-beta-3" diff --git a/oscar/checkupdates.cpp b/oscar/checkupdates.cpp index ccf8830f..8b3e1b16 100644 --- a/oscar/checkupdates.cpp +++ b/oscar/checkupdates.cpp @@ -252,8 +252,19 @@ void CheckUpdates::checkForUpdates(bool showWhenCurrent) void CheckUpdates::replyFinished(QNetworkReply *reply) { + if (showIfCurrent) { + if (checkingBox != nullptr) + checkingBox->reset(); + } + if (reply->error() != QNetworkReply::NoError) { - qWarning() << "Update Check Error: "+reply->errorString(); + qWarning() << "Update Check Error:" << reply->errorString(); + reply->deleteLater(); + if (!showIfCurrent) { // for automatic checks, don't show anything + return; + } + msg = QObject::tr("Unable to check for updates. Please try again later."); + msgIsReady = true; } else { // qDebug() << reply->header(QNetworkRequest::ContentTypeHeader).toString(); // qDebug() << reply->header(QNetworkRequest::LastModifiedHeader).toDateTime().toString(); @@ -272,9 +283,9 @@ void CheckUpdates::replyFinished(QNetworkReply *reply) } else elapsedTime = 0; - } - compareVersions(); + compareVersions(); + } if (showIfCurrent) showMessage();