From 70b54982d83b802b71c00c8722659b4c8b397430 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Wed, 1 Oct 2014 02:24:43 +1000
Subject: [PATCH] Only CPAP & APAP ResMed machine modes have EPR

---
 .../SleepLib/loader_plugins/resmed_loader.cpp | 23 ++++++++++---------
 sleepyhead/mainwindow.cpp                     |  4 ++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
index 779211c3..fa53b655 100644
--- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
@@ -341,21 +341,23 @@ void ResmedLoader::ParseSTR(Machine *mach, QStringList strfiles)
                     R.max_ipap = R.epap + R.max_ps;
                 }
 
+
                 EventDataType epr = -1, epr_level = -1;
-                if ((sig = str.lookupSignal(RMS9_EPR))) {
-                    epr= EventDataType(sig->data[rec]) * sig->gain + sig->offset;
-                }
-                if ((sig = str.lookupSignal(RMS9_EPRLevel))) {
-                    epr_level= EventDataType(sig->data[rec]) * sig->gain + sig->offset;
-                }
+                if ((mode == MODE_CPAP) || (mode == MODE_APAP)) {
+                    if ((sig = str.lookupSignal(RMS9_EPR))) {
+                        epr= EventDataType(sig->data[rec]) * sig->gain + sig->offset;
+                    }
+                    if ((sig = str.lookupSignal(RMS9_EPRLevel))) {
+                        epr_level= EventDataType(sig->data[rec]) * sig->gain + sig->offset;
+                    }
 
-                if ((sig = str.lookupLabel("S.EPR.EPRType"))) {
-                    epr = EventDataType(sig->data[rec]) * sig->gain + sig->offset;
-                    epr += 1;
+                    if ((sig = str.lookupLabel("S.EPR.EPRType"))) {
+                        epr = EventDataType(sig->data[rec]) * sig->gain + sig->offset;
+                        epr += 1;
+                    }
                 }
 
 
-
                 if ((epr >= 0) && (epr_level >= 0)) {
                     R.epr_level = epr_level;
                     R.epr = epr;
@@ -376,7 +378,6 @@ void ResmedLoader::ParseSTR(Machine *mach, QStringList strfiles)
                 }
 
 
-
                 if ((sig = str.lookupLabel("AHI"))) {
                     R.ahi = EventDataType(sig->data[rec]) * sig->gain + sig->offset;
                 }
diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp
index c835ee8f..34701d4e 100644
--- a/sleepyhead/mainwindow.cpp
+++ b/sleepyhead/mainwindow.cpp
@@ -315,10 +315,10 @@ MainWindow::MainWindow(QWidget *parent) :
 
     warnmsg.push_back(tr("<b>Warning:</b> This is a pre-release build, and may at times show unstable behaviour. It is intended for testing purposes."));
     warnmsg.push_back(tr("If you experience CPAP chart/data errors after upgrading to a new version, try rebuilding your CPAP database from the Data menu."));
-    warnmsg.push_back(tr("Make sure your keep your SleepyHead data folder backed up when trying testing versions."));
+    warnmsg.push_back(tr("Make sure you keep your SleepyHead data folder backed up when trying testing versions."));
     warnmsg.push_back(tr("Please ensure you are running the latest version before reporting any bugs."));
     warnmsg.push_back(tr("When reporting bugs, please make sure to supply the SleepyHead version number, operating system details and CPAP machine model."));
-    warnmsg.push_back(tr("Make sure your willing and able to supply a .zip of your CPAP data or a crash report before you think about filing a bug report."));
+    warnmsg.push_back(tr("Make sure you're willing and able to supply a .zip of your CPAP data or a crash report before you think about filing a bug report."));
     warnmsg.push_back(tr("Think twice before filing a bug report that already exists, PLEASE search first, as your likely not the first one to notice it!"));
     warnmsg.push_back(tr("This red message line is intentional, and will not be a feature in the final version..."));
     warnmsg.push_back(tr(""));