comparison 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
comparison
equal deleted inserted replaced
361:aa576f9213bf 362:ca53880fa3ca
288 path.replace("\\", "/"); 288 path.replace("\\", "/");
289 #endif 289 #endif
290 290
291 if (path.endsWith("ton")) { 291 if (path.endsWith("ton")) {
292 if (!haveSession) { 292 if (!haveSession) {
293 status = m_mainWindow->openSessionFile(path); 293 status = m_mainWindow->openSessionPath(path);
294 if (status == MainWindow::FileOpenSucceeded) { 294 if (status == MainWindow::FileOpenSucceeded) {
295 haveSession = true; 295 haveSession = true;
296 haveMainModel = true; 296 haveMainModel = true;
297 } 297 }
298 } else { 298 } else {