Mercurial > hg > sonic-visualiser
comparison main/main.cpp @ 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 | 61111a6a229f |
children | 4bccf2014f80 |
comparison
equal
deleted
inserted
replaced
416:9f25742b5953 | 417:a0d162a3f3a7 |
---|---|
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) { |