# HG changeset patch
# User Chris Cannam
# Date 1340353569 -3600
# Node ID a7ab511107faf47575e22f8d929fcd925f6d21b4
# Parent  368b1f7c7325719564fe00c391e39571e1bf6ad4
Ensure that file load is actually cancelled when user hits Cancel! (fixing SV bug #487)

diff -r 368b1f7c7325 -r a7ab511107fa framework/MainWindowBase.cpp
--- a/framework/MainWindowBase.cpp	Fri May 25 14:17:38 2012 +0100
+++ b/framework/MainWindowBase.cpp	Fri Jun 22 09:26:09 2012 +0100
@@ -1221,9 +1221,16 @@
     bool loadedTemplate = false;
 
     if (mode == ReplaceSession) {
+
+        if (!checkSaveModified()) return FileOpenCancelled;
+
         std::cerr << "SV looking for template " << templateName << std::endl;
         if (templateName != "") {
             FileOpenStatus tplStatus = openSessionTemplate(templateName);
+            if (tplStatus == FileOpenCancelled) {
+                std::cerr << "Template load cancelled" << std::endl;
+                return FileOpenCancelled;
+            }
             if (tplStatus != FileOpenFailed) {
                 std::cerr << "Template load succeeded" << std::endl;
                 loadedTemplate = true;