From f67e36353245f4cfb665f8c2b017dc4fc28ac5bd Mon Sep 17 00:00:00 2001 From: grindhold Date: Sat, 1 Nov 2014 17:36:00 +0100 Subject: [PATCH] attempt to open broken project does not clear currently open project. fixing #781 --- src/core/song.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/song.cpp b/src/core/song.cpp index cfaecc285..06ee2fa81 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -882,8 +882,6 @@ void song::loadProject( const QString & _file_name ) m_loadingProject = true; - clearProject(); - engine::projectJournal()->setJournalling( false ); m_fileName = _file_name; @@ -894,10 +892,11 @@ void song::loadProject( const QString & _file_name ) // new project if( dataFile.head().isNull() ) { - createNewProject(); return; } + clearProject(); + DataFile::LocaleHelper localeHelper( DataFile::LocaleHelper::ModeLoad ); engine::mixer()->lock();