Merge pull request #1258 from grindhold/brokenproject

attempt to open broken project does not clear currently open project
LMMS · Nov 8, 2014 · 2c7036e · 2c7036e
2 parents d10eecb + f67e363
commit 2c7036e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git 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();