changeset 417:a0d162a3f3a7 templating

Use ReplaceSession mode where appropriate in place of ReplaceMainModel (#148)
author Chris Cannam
date Wed, 27 Apr 2011 14:46:35 +0100
parents 9f25742b5953
children 07fbfba541b0
files main/MainWindow.cpp main/main.cpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/main/MainWindow.cpp	Wed Apr 27 11:33:28 2011 +0100
+++ b/main/MainWindow.cpp	Wed Apr 27 14:46:35 2011 +0100
@@ -2149,7 +2149,7 @@
     QString path = getOpenFileName(FileFinder::AudioFile);
 
     if (path != "") {
-	if (openAudio(path, ReplaceMainModel) == FileOpenFailed) {
+	if (openAudio(path, ReplaceSession) == FileOpenFailed) {
             emit hideSplash();
 	    QMessageBox::critical(this, tr("Failed to open file"),
 				  tr("<b>File open failed</b><p>Audio file \"%1\" could not be opened").arg(path));
--- a/main/main.cpp	Wed Apr 27 11:33:28 2011 +0100
+++ b/main/main.cpp	Wed Apr 27 14:46:35 2011 +0100
@@ -468,7 +468,7 @@
     }
     if (status != MainWindow::FileOpenSucceeded) {
         if (!haveMainModel) {
-            status = m_mainWindow->open(path, MainWindow::ReplaceMainModel);
+            status = m_mainWindow->open(path, MainWindow::ReplaceSession);
             if (status == MainWindow::FileOpenSucceeded) {
                 haveMainModel = true;
             }