From a1405d64d8eff36e635bd73dab0ccd82d1abe8cb Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 31 Mar 2005 03:18:58 +0000 Subject: [PATCH] don't wait for the wheel to settle before processing background loads after selecting random --- stepmania/src/ScreenSelectMusic.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 9182411504..69235b9602 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -707,8 +707,10 @@ void ScreenSelectMusic::CheckBackgroundRequests() /* Loading the rest can cause small skips, so don't do it until the wheel settles. * Do load if we're transitioning out, though, so we don't miss starting the music - * for the options screen if a song is selected quickly. */ - if( !m_MusicWheel.IsSettled() && !m_Out.IsTransitioning() ) + * for the options screen if a song is selected quickly. Also, don't do this + * if the wheel is locked, since we're just bouncing around after selecting TYPE_RANDOM, + * and it'll take a while before the wheel will settle. */ + if( !m_MusicWheel.IsSettled() && !m_MusicWheel.WheelIsLocked() && !m_Out.IsTransitioning() ) return; if( g_bBannerWaiting )