From 1ea167268d45ff3bb1da2a9e3f6d016523b7373d Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Thu, 18 Sep 2014 13:16:14 +1000
Subject: [PATCH] Don't try and import when no valid cms50i sessions

---
 sleepyhead/oximeterimport.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/sleepyhead/oximeterimport.cpp b/sleepyhead/oximeterimport.cpp
index 624740ce..552f050f 100644
--- a/sleepyhead/oximeterimport.cpp
+++ b/sleepyhead/oximeterimport.cpp
@@ -287,6 +287,13 @@ void OximeterImport::on_directImportButton_clicked()
 void OximeterImport::doImport()
 {
     if (oximodule->commandDriven()) {
+        if (chosen_sessions.size() == 0) {
+            ui->connectLabel->setText("<h2>"+tr("Nothing to import for %1").arg(oximodule->loaderName())+"</h2>");
+            ui->logBox->appendPlainText(tr("Could not find any valid sessions on your oximeter."));
+
+            updateStatus(tr("Your oximeter did not have any valid sessions"));
+            return;
+        }
         ui->connectLabel->setText("<h2>"+tr("Waiting for %1 to start").arg(oximodule->loaderName())+"</h2>");
         updateStatus(tr("Waiting for the device to start the upload process..."));
     } else {
@@ -301,10 +308,7 @@ void OximeterImport::doImport()
     oximodule->Open("import");
 
     if (oximodule->commandDriven()) {
-        int chosen = 0;
-        if (chosen_sessions.size() > 0) {
-            chosen = chosen_sessions.takeFirst();
-        }
+        int chosen = chosen_sessions.takeFirst();
         oximodule->getSessionData(chosen);
     }