Revert back to ignoring FastLoad when reloading from operator menu

Many people (especially chart authors) expect that behaviour.
This commit is contained in:
Martin Natano
2022-10-28 17:40:02 +02:00
parent a0e805e511
commit 43050643d6
4 changed files with 11 additions and 4 deletions
+1 -1
View File
@@ -177,7 +177,7 @@ void ScreenInstallOverlay::Update( float fDeltaTime )
playAfterLaunchInfo.OverlayWith( pali2 ); playAfterLaunchInfo.OverlayWith( pali2 );
} }
if( playAfterLaunchInfo.bAnySongChanged ) if( playAfterLaunchInfo.bAnySongChanged )
SONGMAN->Reload(); SONGMAN->Reload( false );
if( !playAfterLaunchInfo.sSongDir.empty() ) if( !playAfterLaunchInfo.sSongDir.empty() )
{ {
+1 -1
View File
@@ -84,7 +84,7 @@ void ScreenReloadSongs::Update( float fDeltaTime )
} }
else else
{ {
SONGMAN->Reload( m_pLoadingWindow ); SONGMAN->Reload( false, m_pLoadingWindow );
} }
SCREENMAN->PostMessageToTopScreen( SM_GoToNextScreen, 0 ); SCREENMAN->PostMessageToTopScreen( SM_GoToNextScreen, 0 );
+8 -1
View File
@@ -117,7 +117,7 @@ static LocalizedString UNLOADING_SONGS ( "SongManager", "Unloading songs..." );
static LocalizedString UNLOADING_COURSES ( "SongManager", "Unloading courses..." ); static LocalizedString UNLOADING_COURSES ( "SongManager", "Unloading courses..." );
static LocalizedString SANITY_CHECKING_GROUPS("SongManager", "Sanity checking groups..."); static LocalizedString SANITY_CHECKING_GROUPS("SongManager", "Sanity checking groups...");
void SongManager::Reload( LoadingWindow *ld ) void SongManager::Reload( bool bAllowFastLoad, LoadingWindow *ld )
{ {
FILEMAN->FlushDirCache( SpecialFiles::SONGS_DIR ); FILEMAN->FlushDirCache( SpecialFiles::SONGS_DIR );
FILEMAN->FlushDirCache( SpecialFiles::COURSES_DIR ); FILEMAN->FlushDirCache( SpecialFiles::COURSES_DIR );
@@ -172,6 +172,10 @@ void SongManager::Reload( LoadingWindow *ld )
FreeSongs(); FreeSongs();
const bool oldVal = PREFSMAN->m_bFastLoad;
if( !bAllowFastLoad )
PREFSMAN->m_bFastLoad.Set( false );
InitAll( ld, /*onlyAdditions=*/false ); InitAll( ld, /*onlyAdditions=*/false );
// reload scores and unlocks afterward // reload scores and unlocks afterward
@@ -203,6 +207,9 @@ void SongManager::Reload( LoadingWindow *ld )
} }
UNLOCKMAN->Reload(); UNLOCKMAN->Reload();
if( !bAllowFastLoad )
PREFSMAN->m_bFastLoad.Set( oldVal );
UpdatePreferredSort(); UpdatePreferredSort();
} }
+1 -1
View File
@@ -84,7 +84,7 @@ public:
* last invocation of this function * last invocation of this function
*/ */
void InitAll( LoadingWindow *ld, bool onlyAdditions ); void InitAll( LoadingWindow *ld, bool onlyAdditions );
void Reload( LoadingWindow *ld=nullptr ); void Reload( bool bAllowFastLoad, LoadingWindow *ld=nullptr );
void LoadAdditions( LoadingWindow *ld=nullptr ); void LoadAdditions( LoadingWindow *ld=nullptr );
void PreloadSongImages(); void PreloadSongImages();