From 0195ad338b86ee5c661eb6efc2b1f96fbf5b3426 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 29 Mar 2006 08:37:54 +0000
Subject: [PATCH] fix merge

---
 stepmania/src/ScreenSelectMusic.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index d3087ff062..312ca26869 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -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;