Handle exception throws on script save cancel

Catches SaveCanceledException thrown when user cancels saving from the save as dialogue Refs #8513
mantidproject · Jul 14, 2014 · a7b27f7 · a7b27f7
1 parent b3c0cca
commit a7b27f7
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/Code/Mantid/MantidPlot/src/ScriptFileInterpreter.cpp b/Code/Mantid/MantidPlot/src/ScriptFileInterpreter.cpp
@@ -50,15 +50,24 @@ void ScriptFileInterpreter::prepareToClose()
   QPushButton *saveAsButton = msgBox.addButton("Save As...", QMessageBox::AcceptRole);
   msgBox.addButton(QMessageBox::Discard);
   int ret = msgBox.exec();
-  if( msgBox.clickedButton() == saveAsButton )
-  {
-    m_editor->saveAs();
-  }
-  else if( ret == QMessageBox::Save )
+
+  try
   {
-    m_editor->saveToCurrentFile();
+    if( msgBox.clickedButton() == saveAsButton )
+    {
+      m_editor->saveAs();saveAs
+    }
+    else if( ret == QMessageBox::Save )
+    {
+      m_editor->saveToCurrentFile();
+    }
+    else
+    {
+      m_editor->setModified(false);
+    }
   }
-  else
+  //Catch cancelling save dialogue
+  catch( ScriptEditor::SaveCancelledException sce )
   {
     m_editor->setModified(false);
   }