From 40fcce0ebda96c1e8418a016d3cbf415ef00853a Mon Sep 17 00:00:00 2001
From: LoudSnorer <Just4Me.1947@gmail.com>
Date: Sat, 3 Feb 2024 09:40:42 -0500
Subject: [PATCH] FIX oximetry Wizard crash: null pointer in list of loaders

---
 oscar/SleepLib/loader_plugins/md300w1_loader.cpp | 4 +++-
 oscar/oximeterimport.cpp                         | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/md300w1_loader.cpp b/oscar/SleepLib/loader_plugins/md300w1_loader.cpp
index 901279df..93cc9476 100644
--- a/oscar/SleepLib/loader_plugins/md300w1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/md300w1_loader.cpp
@@ -14,6 +14,9 @@
 // loader that change loader behaviour or modify channels.
 //********************************************************************************************
 
+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+
 // #include <QProgressBar>
 #include <QApplication>
 #include <QDir>
@@ -158,7 +161,6 @@ void MD300W1Loader::resetImportTimeout()
 bool MD300W1Loader::readDATFile(const QString & path)
 {
     QFile file(path);
-    
     qDebug() << "MD300W Loader attempting to read " << path;
     
     if (!file.exists()) {
diff --git a/oscar/oximeterimport.cpp b/oscar/oximeterimport.cpp
index e7bd919d..b7e040b7 100644
--- a/oscar/oximeterimport.cpp
+++ b/oscar/oximeterimport.cpp
@@ -7,6 +7,9 @@
  * License. See the file COPYING in the main directory of the source code
  * for more details. */
 
+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+
 #include <QThread>
 #include <QMessageBox>
 #include <QFileDialog>
@@ -419,14 +422,14 @@ void OximeterImport::on_fileImportButton_clicked()
     // Make sure filename dialog had time to close properly..
     QApplication::processEvents();
 
-	qDebug() << "oximod - Chosen filename is " << filename;
+    qDebug() << "oximod - Chosen filename is " << filename;
     QList<SerialOximeter *> loaders = GetOxiLoaders();
 
     bool success = false;
 
     oximodule = nullptr;
     Q_FOREACH(SerialOximeter * loader, loaders) {
-        if (loader->Open(filename)) {
+        if (loader && loader->Open(filename)) { // there is a null entry in loaders. so ths check is necessary
             success = true;
             oximodule = loader;
             break;