Merge remote-tracking branch 'origin/bugfix/8513_fix_script_window_save_exception_new'

Code/Mantid/MantidPlot/src/ScriptFileInterpreter.cpp

@@ -50,16 +50,26 @@ 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();
+    }
+    else if( ret == QMessageBox::Save )
+    {
+      m_editor->saveToCurrentFile();
+    }
+    else
+    {
+      m_editor->setModified(false);
+    }
   }
-  else
+  //Catch cancelling save dialogue
+  catch( ScriptEditor::SaveCancelledException& sce )
   {
+    UNUSED_ARG(sce);
     m_editor->setModified(false);
   }
 }