From 4e182582a74fdef46c834a8e0bd5f3d6488ccabf Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Tue, 6 Dec 2011 01:16:39 +1000
Subject: [PATCH] Ask to save _before_ opening oximetry load file dialog

---
 oximetry.cpp | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/oximetry.cpp b/oximetry.cpp
index 4b9b2910..4e8c8c7d 100644
--- a/oximetry.cpp
+++ b/oximetry.cpp
@@ -1225,17 +1225,6 @@ void Oximetry::update_progress(float f)
 
 bool Oximetry::openSPOFile(QString filename)
 {
-    if (oximeter->getSession() && oximeter->getSession()->IsChanged()) {
-        int res=QMessageBox::question(this,"Save Session?","Opening this oximetry file will destroy the current session.\nWould you like to keep it?","Save","Destroy It","Cancel",0,2);
-        if (res==0) {
-            on_saveButton_clicked();
-            return false;
-        } else if (res==2) {
-            return false;
-        }
-    } // else it's already saved.
-    //GraphView->setEmptyText("Please Wait");
-    //GraphView->updateGL();
     QFile f(filename);
     if (!f.open(QFile::ReadOnly)) return false;
 
@@ -1384,15 +1373,6 @@ bool Oximetry::openSPOFile(QString filename)
 
 bool Oximetry::openSPORFile(QString filename)
 {
-    if (oximeter->getSession() && oximeter->getSession()->IsChanged()) {
-        int res=QMessageBox::question(this,"Save Session?","Opening this oximetry file will destroy the current session.\nWould you like to keep it?","Save","Destroy It","Cancel",0,2);
-        if (res==0) {
-            on_saveButton_clicked();
-            return false;
-        } else if (res==2) {
-            return false;
-        }
-    } // else it's already saved.
     //GraphView->setEmptyText("Please Wait");
     //GraphView->updateGL();
     QFile f(filename);
@@ -1521,6 +1501,16 @@ bool Oximetry::openSPORFile(QString filename)
 
 void Oximetry::on_openButton_clicked()
 {
+    if (oximeter->getSession() && oximeter->getSession()->IsChanged()) {
+        int res=QMessageBox::question(this,"Save Session?","Opening this oximetry file will destroy the current session.\nWould you like to keep it?","Save","Destroy It","Cancel",0,2);
+        if (res==0) {
+            on_saveButton_clicked();
+            return;
+        } else if (res==2) {
+            return;
+        }
+    } // else it's already saved.
+
     QString dir="";
     QFileDialog fd(this,"Select an oximetry file",dir,"Oximetry Files (*.spo *.spoR)");
     fd.setAcceptMode(QFileDialog::AcceptOpen);