From 4c1c17287d28a2a8b559d1db65e681046ded6ea9 Mon Sep 17 00:00:00 2001
From: LoudSnorer <Just4Me.1947@gmail.com>
Date: Sat, 6 Jul 2024 12:01:53 -0400
Subject: [PATCH] Fix Crash due loader not found

---
 oscar/SleepLib/day.cpp | 21 +++++++++++++--------
 oscar/daily.cpp        |  8 +++++---
 oscar/statistics.cpp   | 14 ++++++++++++--
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/oscar/SleepLib/day.cpp b/oscar/SleepLib/day.cpp
index befaee06..e74e74ea 100644
--- a/oscar/SleepLib/day.cpp
+++ b/oscar/SleepLib/day.cpp
@@ -1,7 +1,7 @@
 /* SleepLib Day Class Implementation
  *
  * Copyright (c) 2019-2024 The OSCAR Team
- * Copyright (c) 2011-2018 Mark Watkins 
+ * Copyright (c) 2011-2018 Mark Watkins
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License. See the file COPYING in the main directory of the source code
@@ -136,7 +136,7 @@ void Day::addSession(Session *s)
                  << "from machine" << s->machine()->serial() << "with first=0";
         return;
     }
-    
+
     for (auto & sess : sessions) {
         if (sess->session() == s->session() && sess->type() == s->type()) {
             // This usually indicates a problem in purging or cleanup somewhere,
@@ -854,7 +854,7 @@ ChannelID Day::getPressureChannelID() {
             return preferredID;
         }
     }
-    
+
     qDebug() << "No pressure channel for " << getCPAPModeStr();
     return NoChannel;
 }
@@ -1419,7 +1419,7 @@ void Day::removeMachine(Machine * mach)
     //
     // This has no functional use and can be removed when the data structures are cleaned up
     // with better encapsulation and fewer unnecessary references between each other.
-    
+
     QList<Session*> list = sessions;  // make a copy so the iterator doesn't get broken by removals
     for (auto & sess : list) {
         if (sess->machine() == mach) {
@@ -1430,7 +1430,7 @@ void Day::removeMachine(Machine * mach)
             removeSession(sess);
         }
     }
-    
+
     for (auto & m : machines.keys()) {
         if (machines[m] == mach) {
             // This indicates a problem internal to the Day class, since removeSession should remove
@@ -1452,6 +1452,7 @@ int Day::getCPAPMode()
     if (!mach) return 0;
 
     CPAPLoader * loader = qobject_cast<CPAPLoader *>(mach->loader());
+    if (!loader) return 0;
 
     ChannelID modechan = loader->CPAPModeChannel();
     */
@@ -1472,6 +1473,9 @@ QString Day::getCPAPModeStr()
     if (!mach) return STR_MessageBox_Error;
 
     CPAPLoader * loader = qobject_cast<CPAPLoader *>(mach->loader());
+    if (!loader) {
+        return QObject::tr("ERROR:NOT AVAILABLE"); //STR_MessageBox_Error;
+    }
 
     ChannelID modechan = loader->CPAPModeChannel();
 
@@ -1511,8 +1515,9 @@ QString Day::getPressureRelief()
     if (!mach) return STR_MessageBox_Error;
 
     CPAPLoader * loader = qobject_cast<CPAPLoader *>(mach->loader());
-
-    if (!loader) return STR_MessageBox_Error;
+    if (!loader) {
+        return QObject::tr("ERROR:NOT AVAILABLE"); //STR_MessageBox_Error;
+    }
 
     QString pr_str;
 
@@ -1633,7 +1638,7 @@ QString Day::getPressureSettings()
                 arg(validPressure(settings_max(CPAP_IPAPLo))).
                 arg(validPressure(settings_max(CPAP_IPAPHi))).
                 arg(units);
-        else 
+        else
             retStr = QObject::tr("EPAP %1-%2 IPAP %3-%4 (%5)").
                 arg(validPressure(settings_min(CPAP_EPAPLo))).
                 arg(validPressure(settings_min(CPAP_EPAPHi))).
diff --git a/oscar/daily.cpp b/oscar/daily.cpp
index cca37414..871b1239 100644
--- a/oscar/daily.cpp
+++ b/oscar/daily.cpp
@@ -1114,9 +1114,13 @@ QString Daily::getSessionInformation(Day * day)
 
 QString Daily::getMachineSettings(Day * day) {
     QString html;
-
     Machine * cpap = day->machine(MT_CPAP);
     if (cpap && day->hasEnabledSessions(MT_CPAP)) {
+        CPAPLoader * loader = qobject_cast<CPAPLoader *>(cpap->loader());
+        if (!loader) {
+            htmlLsbSectionHeader(html,tr("DEVICE SETTINGS ERROR"),LSB_DEVICE_SETTINGS );
+            return html;
+        }
         htmlLsbSectionHeader(html,tr("Device Settings"),LSB_DEVICE_SETTINGS );
         if (!leftSideBarEnable[LSB_DEVICE_SETTINGS] ) {
             return html;
@@ -1139,8 +1143,6 @@ QString Daily::getMachineSettings(Day * day) {
         }
         QMap<int, QString> first;
 
-        CPAPLoader * loader = qobject_cast<CPAPLoader *>(cpap->loader());
-
         ChannelID cpapmode = loader->CPAPModeChannel();
         schema::Channel & chan = schema::channel[cpapmode];
         first[cpapmode] = QString("<tr><td><p title='%2'>%1</p></td><td colspan=4>%3</td></tr>")
diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index ca6cc459..39a53a39 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -108,7 +108,8 @@ QDataStream & operator>>(QDataStream & in, RXItem & rx)
     if (loader) {
         rx.machine = p_profile->lookupMachine(serial, loadername);
     } else {
-        qDebug() << "Bad machine object" << loadername << serial;
+        qDebug() << "Bad machine object" << loadername << serial << (void*)loader;
+
         rx.machine = nullptr;
     }
 
@@ -180,7 +181,9 @@ void Statistics::loadRXChanges()
         QList<QDate> toErase;
         for (auto ri = rxitems.begin(); ri != rxitems.end();++ri ) {
             RXItem rxitem = ri.value();
-            if (rxitem.machine==0) toErase.append(ri.key());
+            if (rxitem.machine==nullptr) {
+                toErase.append(ri.key());
+            }
         }
         for (auto date : toErase) {
             rxitems.remove(date) ;
@@ -339,6 +342,9 @@ void Statistics::updateRXChanges()
 
     // Read the cache from disk
     loadRXChanges();
+    if (rxitems.size() == 0) {
+        return;
+    }
     QMap<QDate, Day *>::iterator di;
 
     QMap<QDate, Day *>::iterator it;
@@ -560,6 +566,10 @@ void Statistics::updateRXChanges()
                 }
             }
         }
+        if (rxitems.size() == 0) {
+            return;
+        }
+
 
 
         if (fnd) continue; // already in rx list, move onto the next daylist entry