Merge commit 'origin/master' into fx-mixer-rework

src/core/lame_library.cpp

@@ -44,6 +44,7 @@ LameLibrary::LameLibrary() :
 			QMessageBox::Ok | QMessageBox::Default );
 		delete m_lameLib;
 		m_lameLib = NULL;
+		return;
 	}
 
 	// grab the functions and stuff we need
@@ -155,6 +156,7 @@ LameLibrary::LameLibrary() :
 		m_lameLib->unload();
 		delete m_lameLib;
 		m_lameLib = NULL;
+		return;
 	}
 }
 

src/core/song.cpp

@@ -1086,12 +1086,17 @@ void song::importProject()
 {
 	QFileDialog ofd( NULL, tr( "Import file" ),
 			configManager::inst()->userProjectsDir(),
-			tr("MIDI sequences (*.mid *.rif);;FL Studio projects (*.flp"
+			tr("MIDI sequences") +
+			" (*.mid *.midi *.rmi);;" +
+			tr("FL Studio projects") +
+			" (*.flp"
 #ifdef LMMS_HAVE_ZIP	
-			 " *.zip)") );
+				" *.zip);;" +
 #else 
-			 ")") );
+			 	");;" +
 #endif
+			tr("All file types") +
+			" (*.*)");
 
 	ofd.setFileMode( QFileDialog::ExistingFiles );
 	if( ofd.exec () == QDialog::Accepted && !ofd.selectedFiles().isEmpty() )