chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX oximetry Wizard crash: null pointer in list of loaders

Browse Source
This commit is contained in:
LoudSnorer 2024-02-03 09:40:42 -05:00
parent 9558a488a4
commit 40fcce0ebd
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oscar/SleepLib/loader_plugins/md300w1_loader.cpp
View File

@ -14,6 +14,9 @@
// loader that change loader behaviour or modify channels. // loader that change loader behaviour or modify channels.
//******************************************************************************************** //********************************************************************************************
#define TEST_MACROS_ENABLEDoff
#include <test_macros.h>
// #include <QProgressBar> // #include <QProgressBar>
#include <QApplication> #include <QApplication>
#include <QDir> #include <QDir>
@ -158,7 +161,6 @@ void MD300W1Loader::resetImportTimeout()
bool MD300W1Loader::readDATFile(const QString & path) bool MD300W1Loader::readDATFile(const QString & path)
{ {
QFile file(path); QFile file(path);
qDebug() << "MD300W Loader attempting to read " << path; qDebug() << "MD300W Loader attempting to read " << path;
if (!file.exists()) { if (!file.exists()) {

7
oscar/oximeterimport.cpp
View File

@ -7,6 +7,9 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#define TEST_MACROS_ENABLEDoff
#include <test_macros.h>
#include <QThread> #include <QThread>
#include <QMessageBox> #include <QMessageBox>
#include <QFileDialog> #include <QFileDialog>
@ -419,14 +422,14 @@ void OximeterImport::on_fileImportButton_clicked()
// Make sure filename dialog had time to close properly.. // Make sure filename dialog had time to close properly..
QApplication::processEvents(); QApplication::processEvents();
qDebug() << "oximod - Chosen filename is " << filename; qDebug() << "oximod - Chosen filename is " << filename;
QList<SerialOximeter *> loaders = GetOxiLoaders(); QList<SerialOximeter *> loaders = GetOxiLoaders();
bool success = false; bool success = false;
oximodule = nullptr; oximodule = nullptr;
Q_FOREACH(SerialOximeter * loader, loaders) { 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; success = true;
oximodule = loader; oximodule = loader;
break; break;