fix merge

This commit is contained in:
Glenn Maynard
2006-03-29 08:37:54 +00:00
parent 31eb3ee344
commit 0195ad338b
+1 -1
View File
@@ -632,7 +632,7 @@ void ScreenSelectMusic::CheckBackgroundRequests( bool bForce )
if( g_bSampleMusicWaiting )
{
/* Don't start the music sample when moving fast. */
if( g_StartedLoadingAt.Ago() < SAMPLE_MUSIC_DELAY || bForce )
if( g_StartedLoadingAt.Ago() < SAMPLE_MUSIC_DELAY && !bForce )
return;
g_bSampleMusicWaiting = false;