From 956a405c80a159eb20cdaad4eb3a8ffd3ef330e4 Mon Sep 17 00:00:00 2001
From: Phil Olynyk <phil@pholynyk.ca>
Date: Tue, 15 Sep 2020 13:19:35 -0400
Subject: [PATCH 1/4] change VERSION to v1.2.0-beta-3

---
 oscar/VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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"
 

From 235b5ea9f5f49c9f0cedc96ea495abe741f3bf47 Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Tue, 15 Sep 2020 10:41:19 -0700
Subject: [PATCH 2/4] Release notes for 1.2.0-beta-3 updated.

---
 Htmldocs/release_notes.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 @@
     <b>For other languages, go to:</b>
     <br><a href=http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes>http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes</a></p>
     <p>
-    <b>Changes and fixes in OSCAR v1.2.0-beta-XXX</b>
+    <b>Changes and fixes in OSCAR v1.2.0-beta-3</b>
     <br>Portions of OSCAR are © 2019-2020 by
     <i>The OSCAR Team</i></p>
     <ul>
@@ -22,6 +22,9 @@
         </ul>
       </li>
       <li>[fix] Improve support of rare Philips Respironics 1030X events and update warnings.</li>
+      <li>[fix] Profile page and Daily records block now shows most recently used machine when a profile has multiple machines.</li>
+      <li>[fix] Corrected error in beta-1and 2 where date last imported was lost.</li>
+      <li>[fix] Translations updated.</li>
     </ul></p>
     <p>
     <b>Changes and fixes in OSCAR v1.2.0-beta-2</b>

From 8d2578872a650808c68260914408ee87f1078ba1 Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Wed, 16 Sep 2020 13:05:45 -0700
Subject: [PATCH 3/4] Add an error message to Check for Updates when unable to
 access the update on our server.

---
 oscar/checkupdates.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/oscar/checkupdates.cpp b/oscar/checkupdates.cpp
index ccf8830f..b6693052 100644
--- a/oscar/checkupdates.cpp
+++ b/oscar/checkupdates.cpp
@@ -253,7 +253,10 @@ void CheckUpdates::checkForUpdates(bool showWhenCurrent)
 void CheckUpdates::replyFinished(QNetworkReply *reply)
 {
     if (reply->error() != QNetworkReply::NoError) {
-        qWarning() << "Update Check Error: "+reply->errorString();
+        qWarning() << "Update Check Error:" << reply->errorString();
+        msg = QObject::tr("Unable to check for updates. Please try again later.");
+//        msg += "<br><br>" + reply->errorString();
+        msgIsReady = true;
     } else {
 //      qDebug() << reply->header(QNetworkRequest::ContentTypeHeader).toString();
 //      qDebug() << reply->header(QNetworkRequest::LastModifiedHeader).toDateTime().toString();
@@ -272,9 +275,9 @@ void CheckUpdates::replyFinished(QNetworkReply *reply)
         }
         else
             elapsedTime = 0;
-    }
 
-    compareVersions();
+        compareVersions();
+    }
 
     if (showIfCurrent)
         showMessage();

From dc5540d2a830f066bad74a8a42574cac6ee4b6c1 Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Fri, 18 Sep 2020 10:40:05 -0700
Subject: [PATCH 4/4] Don't show versions.xml read errors for automatic checks.

---
 oscar/checkupdates.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/oscar/checkupdates.cpp b/oscar/checkupdates.cpp
index b6693052..8b3e1b16 100644
--- a/oscar/checkupdates.cpp
+++ b/oscar/checkupdates.cpp
@@ -252,10 +252,18 @@ 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();
+        reply->deleteLater();
+        if (!showIfCurrent) {  // for automatic checks, don't show anything
+            return;
+        }
         msg = QObject::tr("Unable to check for updates. Please try again later.");
-//        msg += "<br><br>" + reply->errorString();
         msgIsReady = true;
     } else {
 //      qDebug() << reply->header(QNetworkRequest::ContentTypeHeader).toString();