Revert back to ignoring FastLoad when reloading from operator menu
Many people (especially chart authors) expect that behaviour.
This commit is contained in:
@@ -177,7 +177,7 @@ void ScreenInstallOverlay::Update( float fDeltaTime )
|
||||
playAfterLaunchInfo.OverlayWith( pali2 );
|
||||
}
|
||||
if( playAfterLaunchInfo.bAnySongChanged )
|
||||
SONGMAN->Reload();
|
||||
SONGMAN->Reload( false );
|
||||
|
||||
if( !playAfterLaunchInfo.sSongDir.empty() )
|
||||
{
|
||||
|
||||
@@ -84,7 +84,7 @@ void ScreenReloadSongs::Update( float fDeltaTime )
|
||||
}
|
||||
else
|
||||
{
|
||||
SONGMAN->Reload( m_pLoadingWindow );
|
||||
SONGMAN->Reload( false, m_pLoadingWindow );
|
||||
}
|
||||
|
||||
SCREENMAN->PostMessageToTopScreen( SM_GoToNextScreen, 0 );
|
||||
|
||||
+8
-1
@@ -117,7 +117,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( LoadingWindow *ld )
|
||||
void SongManager::Reload( bool bAllowFastLoad, LoadingWindow *ld )
|
||||
{
|
||||
FILEMAN->FlushDirCache( SpecialFiles::SONGS_DIR );
|
||||
FILEMAN->FlushDirCache( SpecialFiles::COURSES_DIR );
|
||||
@@ -172,6 +172,10 @@ void SongManager::Reload( LoadingWindow *ld )
|
||||
|
||||
FreeSongs();
|
||||
|
||||
const bool oldVal = PREFSMAN->m_bFastLoad;
|
||||
if( !bAllowFastLoad )
|
||||
PREFSMAN->m_bFastLoad.Set( false );
|
||||
|
||||
InitAll( ld, /*onlyAdditions=*/false );
|
||||
|
||||
// reload scores and unlocks afterward
|
||||
@@ -203,6 +207,9 @@ void SongManager::Reload( LoadingWindow *ld )
|
||||
}
|
||||
UNLOCKMAN->Reload();
|
||||
|
||||
if( !bAllowFastLoad )
|
||||
PREFSMAN->m_bFastLoad.Set( oldVal );
|
||||
|
||||
UpdatePreferredSort();
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -84,7 +84,7 @@ public:
|
||||
* last invocation of this function
|
||||
*/
|
||||
void InitAll( LoadingWindow *ld, bool onlyAdditions );
|
||||
void Reload( LoadingWindow *ld=nullptr );
|
||||
void Reload( bool bAllowFastLoad, LoadingWindow *ld=nullptr );
|
||||
void LoadAdditions( LoadingWindow *ld=nullptr );
|
||||
void PreloadSongImages();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user