From 150bc3a3bc438b0e4f867b97642728a2349ed627 Mon Sep 17 00:00:00 2001
From: Phil Olynyk <phil@pholynyk.ca>
Date: Sun, 12 Sep 2021 13:45:24 -0400
Subject: [PATCH] Test for Ident.json file first, complain if both .json and
 .tgt exisit

---
 .../SleepLib/loader_plugins/resmed_loader.cpp | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
index 326021db..a34e2a66 100644
--- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
@@ -263,26 +263,14 @@ MachineInfo ResmedLoader::PeekInfo(const QString & path)
 
     QFile f(path+"/"+RMS9_STR_idfile+"tgt");
 
-    // Abort if this file is dodgy..
-    if (f.exists() ) {
-        if ( !f.open(QIODevice::ReadOnly)) {
-            return MachineInfo();
-        }
-        MachineInfo info = newInfo();
-
-        // Parse # entries into idmap.
-        while (!f.atEnd()) {
-            QString line = f.readLine().trimmed();
-            QHash<QString, QString> hash = parseIdentLine( line, & info );
-        }
-
-        return info;
-    }
-    QFile j(path+"/"+RMS9_STR_idfile+"json");
-    if (j.exists() ) {
+    QFile j(path+"/"+RMS9_STR_idfile+"json");       // Check for AS11 file first, just in case
+    if (j.exists() ) {                              // somebody is reusing an SD card w/o re-formatting
         if ( !j.open(QIODevice::ReadOnly)) {
             return MachineInfo();
         }
+        if ( f.exists() ) {
+            qDebug() << "Old Ident.tgt file is ignored";
+        }
         QByteArray identData = j.readAll();
         j.close();
         QJsonDocument identDoc(QJsonDocument::fromJson(identData));
@@ -301,6 +289,21 @@ MachineInfo ResmedLoader::PeekInfo(const QString & path)
         }
 
     }
+    // Abort if this file is dodgy..
+    if (f.exists() ) {
+        if ( !f.open(QIODevice::ReadOnly)) {
+            return MachineInfo();
+        }
+        MachineInfo info = newInfo();
+
+        // Parse # entries into idmap.
+        while (!f.atEnd()) {
+            QString line = f.readLine().trimmed();
+            QHash<QString, QString> hash = parseIdentLine( line, & info );
+        }
+
+        return info;
+    }
     // neither filename exists, return empty info
     return MachineInfo();
 }