From 6c7ebfafe82cfd1e004b0b5609cd6278685a23d3 Mon Sep 17 00:00:00 2001
From: Henrik Andersson <henke@henke37.cjb.net>
Date: Sat, 4 Jun 2011 23:37:36 +0200
Subject: [PATCH] [loading window] Note to self #2: Refresh the file list
 before commiting.

---
 src/ScreenInstallOverlay.cpp | 2 +-
 src/SongManager.cpp          | 8 ++++----
 src/StepMania.cpp            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ScreenInstallOverlay.cpp b/src/ScreenInstallOverlay.cpp
index b1037fce23..7453d08ddc 100644
--- a/src/ScreenInstallOverlay.cpp
+++ b/src/ScreenInstallOverlay.cpp
@@ -360,7 +360,7 @@ void ScreenInstallOverlay::Update( float fDeltaTime )
 	}
 
 	if( playAfterLaunchInfo.bAnySongChanged )
-		SONGMAN->Reload( false, NULL );
+		SONGMAN->Reload( false );
 
 	if( !playAfterLaunchInfo.sSongDir.empty() )
 	{
diff --git a/src/SongManager.cpp b/src/SongManager.cpp
index ddbf30d638..b4cfceab4e 100644
--- a/src/SongManager.cpp
+++ b/src/SongManager.cpp
@@ -98,7 +98,7 @@ void SongManager::InitAll()
 }
 
 static LocalizedString RELOADING ( "SongManager", "Reloading..." );
-void SongManager::Reload( bool bAllowFastLoad, LoadingWindow *ld )
+void SongManager::Reload( bool bAllowFastLoad )
 {
 	FILEMAN->FlushDirCache( SpecialFiles::SONGS_DIR );
 	FILEMAN->FlushDirCache( ADDITIONAL_SONGS_DIR );
@@ -106,8 +106,8 @@ void SongManager::Reload( bool bAllowFastLoad, LoadingWindow *ld )
 	FILEMAN->FlushDirCache( ADDITIONAL_COURSES_DIR );
 	FILEMAN->FlushDirCache( EDIT_SUBDIR );
 
-	if( ld )
-		ld->SetText( RELOADING );
+	if( pLoadingWindow )
+		pLoadingWindow->SetText( RELOADING );
 
 	// save scores before unloading songs, of the scores will be lost
 	PROFILEMAN->SaveMachineProfile();
@@ -119,7 +119,7 @@ void SongManager::Reload( bool bAllowFastLoad, LoadingWindow *ld )
 	if( !bAllowFastLoad )
 		PREFSMAN->m_bFastLoad.Set( false );
 
-	InitAll( ld );
+	InitAll();
 
 	// reload scores and unlocks afterward
 	PROFILEMAN->LoadMachineProfile();
diff --git a/src/StepMania.cpp b/src/StepMania.cpp
index 0134c68e4c..3463d57b47 100644
--- a/src/StepMania.cpp
+++ b/src/StepMania.cpp
@@ -1079,7 +1079,7 @@ int main(int argc, char* argv[])
 
 	// depends on SONGINDEX:
 	SONGMAN		= new SongManager;
-	SONGMAN->InitAll( pLoadingWindow );	// this takes a long time
+	SONGMAN->InitAll();	// this takes a long time
 	CRYPTMAN	= new CryptManager;		// need to do this before ProfileMan
 	if( PREFSMAN->m_bSignProfileData )
 		CRYPTMAN->GenerateGlobalKeys();