comparison framework/MainWindowBase.cpp @ 720:55f317633b93

Fix failure to notice we are no longer opening an audio file, if user cancels the save-modified dialog. This led to refusal to respect the close button on the main window.

             return FileOpenFailed;
         }
     }
 
     auto newModelId = ModelById::add(newModel);
-    return addOpenedAudioModel(source, newModelId, mode, templateName, true);
+    auto status = addOpenedAudioModel
+        (source, newModelId, mode, templateName, true);
+    m_openingAudioFile = false;
+    return status;
 }
 
 MainWindowBase::FileOpenStatus
 MainWindowBase::addOpenedAudioModel(FileSource source,
                                     ModelId newModel,

 
     bool loadedTemplate = false;
 
     if (mode == ReplaceSession) {
 
-        if (!checkSaveModified()) return FileOpenCancelled;
+        if (!checkSaveModified()) {
+            m_openingAudioFile = false;
+            return FileOpenCancelled;
+        }
 
         SVDEBUG << "SV looking for template " << templateName << endl;
         if (templateName != "") {
             FileOpenStatus tplStatus = openSessionTemplate(templateName);
             if (tplStatus == FileOpenCancelled) {
                 SVDEBUG << "Template load cancelled" << endl;
+                m_openingAudioFile = false;
                 return FileOpenCancelled;
             }
             if (tplStatus != FileOpenFailed) {
                 SVDEBUG << "Template load succeeded" << endl;
                 loadedTemplate = true;