diff framework/MainWindowBase.cpp @ 417:d62a622a0e40 tonioni

Merge from default branch

--- a/framework/MainWindowBase.cpp	Tue Sep 09 16:36:21 2014 +0100
+++ b/framework/MainWindowBase.cpp	Mon Nov 10 09:20:33 2014 +0000
@@ -1268,7 +1268,14 @@
 
 //    cerr << "template is: \"" << templateName << "\"" << endl;
 
-    if (!source.isAvailable()) return FileOpenFailed;
+    if (!source.isAvailable()) {
+        if (source.wasCancelled()) {
+            return FileOpenCancelled;
+        } else {
+            return FileOpenFailed;
+        }
+    }
+
     source.waitForData();
 
     m_openingAudioFile = true;
@@ -1286,7 +1293,11 @@
     if (!newModel->isOK()) {
 	delete newModel;
         m_openingAudioFile = false;
-	return FileOpenFailed;
+        if (source.wasCancelled()) {
+            return FileOpenCancelled;
+        } else { 
+            return FileOpenFailed;
+        }
     }
 
 //    cerr << "mode = " << mode << endl;