diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp
index 192532e5c1..51e278c24d 100644
--- a/stepmania/src/RageSound.cpp
+++ b/stepmania/src/RageSound.cpp
@@ -575,10 +575,9 @@ void RageSound::SetPlaybackRate( float fScale )
 /* This is used to start music.  It probably belongs in RageSoundManager. */
 void RageSound::LoadAndPlayIfNotAlready( CString sSoundFilePath )
 {
-	SOUNDMAN->lock.Lock();
+	LockMutex L(SOUNDMAN->lock);
 	if( GetLoadedFilePath() == sSoundFilePath && IsPlaying() )
 		return;		// do nothing
-	SOUNDMAN->lock.Unlock();
 
 	Load( sSoundFilePath );
 	SetLooping();