Mercurial > hg > tony
diff src/main.cpp @ 362:ca53880fa3ca
Merge from default branch, and update to make sure we retain the DAW-style scrolling (page without moving playhead on scroll)
author | Chris Cannam |
---|---|
date | Wed, 02 Jul 2014 19:22:05 +0100 |
parents | aa576f9213bf |
children | fec4dafd9093 |
line wrap: on
line diff
--- a/src/main.cpp Thu Jun 19 14:52:37 2014 +0100 +++ b/src/main.cpp Wed Jul 02 19:22:05 2014 +0100 @@ -290,7 +290,7 @@ if (path.endsWith("ton")) { if (!haveSession) { - status = m_mainWindow->openSessionFile(path); + status = m_mainWindow->openSessionPath(path); if (status == MainWindow::FileOpenSucceeded) { haveSession = true; haveMainModel = true;