diff --git a/src/ScreenInstallOverlay.cpp b/src/ScreenInstallOverlay.cpp index fa3aed0485..d988b439b8 100644 --- a/src/ScreenInstallOverlay.cpp +++ b/src/ScreenInstallOverlay.cpp @@ -177,7 +177,7 @@ void ScreenInstallOverlay::Update( float fDeltaTime ) playAfterLaunchInfo.OverlayWith( pali2 ); } if( playAfterLaunchInfo.bAnySongChanged ) - SONGMAN->Reload( false, nullptr ); + SONGMAN->Reload( nullptr ); if( !playAfterLaunchInfo.sSongDir.empty() ) { diff --git a/src/ScreenReloadSongs.cpp b/src/ScreenReloadSongs.cpp index 27a737cb2c..0b6dbfe63a 100644 --- a/src/ScreenReloadSongs.cpp +++ b/src/ScreenReloadSongs.cpp @@ -77,7 +77,7 @@ void ScreenReloadSongs::Update( float fDeltaTime ) ASSERT( !IsFirstUpdate() ); - SONGMAN->Reload( false, m_pLoadingWindow ); + SONGMAN->Reload( m_pLoadingWindow ); SCREENMAN->PostMessageToTopScreen( SM_GoToNextScreen, 0 ); } diff --git a/src/SongManager.cpp b/src/SongManager.cpp index f74e853820..7f790f4ed1 100644 --- a/src/SongManager.cpp +++ b/src/SongManager.cpp @@ -113,7 +113,7 @@ static LocalizedString UNLOADING_SONGS ( "SongManager", "Unloading songs..." ); static LocalizedString UNLOADING_COURSES ( "SongManager", "Unloading courses..." ); static LocalizedString SANITY_CHECKING_GROUPS("SongManager", "Sanity checking groups..."); -void SongManager::Reload( bool bAllowFastLoad, LoadingWindow *ld ) +void SongManager::Reload( LoadingWindow *ld ) { FILEMAN->FlushDirCache( SpecialFiles::SONGS_DIR ); FILEMAN->FlushDirCache( SpecialFiles::COURSES_DIR ); @@ -168,10 +168,6 @@ void SongManager::Reload( bool bAllowFastLoad, LoadingWindow *ld ) FreeSongs(); - const bool OldVal = PREFSMAN->m_bFastLoad; - if( !bAllowFastLoad ) - PREFSMAN->m_bFastLoad.Set( false ); - InitAll( ld ); // reload scores and unlocks afterward @@ -203,9 +199,6 @@ void SongManager::Reload( bool bAllowFastLoad, LoadingWindow *ld ) } UNLOCKMAN->Reload(); - if( !bAllowFastLoad ) - PREFSMAN->m_bFastLoad.Set( OldVal ); - UpdatePreferredSort(); } diff --git a/src/SongManager.h b/src/SongManager.h index 9859e8e9dd..ee0e9bf62c 100644 --- a/src/SongManager.h +++ b/src/SongManager.h @@ -65,7 +65,7 @@ public: void InvalidateCachedTrails(); void InitAll( LoadingWindow *ld ); // songs, courses, groups - everything. - void Reload( bool bAllowFastLoad, LoadingWindow *ld=nullptr ); // songs, courses, groups - everything. + void Reload( LoadingWindow *ld=nullptr ); // songs, courses, groups - everything. void PreloadSongImages(); bool IsGroupNeverCached(const RString& group) const;