comparison main/main.cpp @ 456:4bccf2014f80

Merge from branch "templating"
author Chris Cannam
date Sun, 26 Jun 2011 19:56:01 +0100
parents 868f73825b37 a0d162a3f3a7
children b3b9cc8f5466 c11a29843fe1
comparison
equal deleted inserted replaced
452:fa0c3e79ea8e 456:4bccf2014f80
466 status = MainWindow::FileOpenSucceeded; 466 status = MainWindow::FileOpenSucceeded;
467 } 467 }
468 } 468 }
469 if (status != MainWindow::FileOpenSucceeded) { 469 if (status != MainWindow::FileOpenSucceeded) {
470 if (!haveMainModel) { 470 if (!haveMainModel) {
471 status = m_mainWindow->open(path, MainWindow::ReplaceMainModel); 471 status = m_mainWindow->open(path, MainWindow::ReplaceSession);
472 if (status == MainWindow::FileOpenSucceeded) { 472 if (status == MainWindow::FileOpenSucceeded) {
473 haveMainModel = true; 473 haveMainModel = true;
474 } 474 }
475 } else { 475 } else {
476 if (haveSession && !havePriorCommandLineModel) { 476 if (haveSession && !havePriorCommandLineModel) {