add ReadGlobalPrefsFromDisk( bSwitchToLastPlayedGame, fn )

stepmania/src/PrefsManager.cpp

@@ -168,10 +168,10 @@ PrefsManager::~PrefsManager()
 {
 }
 
-void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame )
+void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame, CString fn )
 {
 	IniFile ini;
-	ini.SetPath( STEPMANIA_INI_PATH );
+	ini.SetPath( fn );
 	if( !ini.ReadFile() )
 		return;		// could not read config file, load nothing
 
@@ -284,12 +284,18 @@ void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame )
 		ini.GetValue( "Options", ssprintf("DefaultProfileP%d",p+1),	m_sDefaultProfile[p] );
 
 
-	m_asAdditionalSongFolders.clear();
 	CString sAdditionalSongFolders;
-	ini.GetValue( "Options", "AdditionalSongFolders",			sAdditionalSongFolders );
+	if( ini.GetValue( "Options", "AdditionalSongFolders",			sAdditionalSongFolders ) )
+	{
+		m_asAdditionalSongFolders.clear();
 		split( sAdditionalSongFolders, ",", m_asAdditionalSongFolders, true );
 	}
+}
 
+void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame )
+{
+	ReadGlobalPrefsFromDisk( bSwitchToLastPlayedGame, STEPMANIA_INI_PATH );
+}
 
 void PrefsManager::SaveGlobalPrefsToDisk() const
 {

stepmania/src/PrefsManager.h

@@ -142,6 +142,9 @@ public:
 
 	void ReadGamePrefsFromDisk();
 	void SaveGamePrefsToDisk();
+
+private:
+	void ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame, CString fn );
 };