From 8fd2840e15e701311ef39ff82cc394c1d318dbcc Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Tue, 26 Oct 2021 12:24:31 -0400
Subject: [PATCH] Fix the PRS1 loader to fully import DS1 data after it skips
 DS2 data.

This was a very specific edge case: when there was a single new DS1
session, the error resulting from encountering DS2 data would make
OSCAR think that it had imported zero sessions, even though it had
half-imported the DS1 session. (Those sessions would be lost after
quitting OSCAR.)
---
 Htmldocs/release_notes.html                   | 1 +
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index ee36a7f6..ebf486f9 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -19,6 +19,7 @@
       <li>[fix] Update copyright notices in html files.</li>
       <li>[fix] Correct value display on exact data points, and near session boundaries with drift.</li>
       <li>[fix] Link to translations in Credits and Release Notes html is now translated to selected language.</li>
+      <li>[fix] Continue to import DreamStation 1 data even if there is (unsupported) DreamStation 2 data on the SD card.</li>
     </ul>
     <p>
     <b>Changes and fixes in OSCAR v1.3.0</b>
diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 13d12f0a..f4d37c74 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -737,7 +737,10 @@ int PRS1Loader::Open(const QString & selectedPath)
             qWarning() << "PRS1Loader::Open() called without a valid m_ctx object present";
             return 0;
         }
-        c += OpenMachine(machinePath);
+        int imported = OpenMachine(machinePath);
+        if (imported > 0) {  // don't let errors < 0 suppress subsequent successes
+            c += imported;
+        }
         m_ctx->FlushUnexpectedMessages();
     }
     return c;