From 88baa838a84802db24708ad5d24d2d13843dbe41 Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Fri, 15 Sep 2006 02:28:05 +0000
Subject: [PATCH] Unwrap. Also make start only trigger on the first press.
 Without this, alt-enter will start the song.

---
 stepmania/src/ScreenSelectMusic.cpp | 86 ++++++++++++++---------------
 1 file changed, 42 insertions(+), 44 deletions(-)

diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 30f12cac39..35a9106d32 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -453,53 +453,51 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 	}
 
 
-	if( input.type == IET_FIRST_PRESS )
+	if( input.type != IET_FIRST_PRESS )
+		return;
+
+	if( CodeDetector::EnteredEasierDifficulty(input.GameI.controller) )
 	{
-		if( CodeDetector::EnteredEasierDifficulty(input.GameI.controller) )
-		{
-			if( GAMESTATE->IsAnExtraStage() )
-				m_soundLocked.Play();
-			else
-				ChangeDifficulty( pn, -1 );
-			return;
-		}
-		if( CodeDetector::EnteredHarderDifficulty(input.GameI.controller) )
-		{
-			if( GAMESTATE->IsAnExtraStage() )
-				m_soundLocked.Play();
-			else
-				ChangeDifficulty( pn, +1 );
-			return;
-		}
-		if( CodeDetector::EnteredModeMenu(input.GameI.controller) )
-		{
-			if( MODE_MENU_AVAILABLE )
-				m_MusicWheel.ChangeSort( SORT_MODE_MENU );
-			else
-				m_soundLocked.Play();
-			return;
-		}
-		if( CodeDetector::EnteredNextSort(input.GameI.controller) )
-		{
-			if( ( GAMESTATE->IsExtraStage() && !PREFSMAN->m_bPickExtraStage ) || GAMESTATE->IsExtraStage2() )
-				m_soundLocked.Play();
-			else
-				m_MusicWheel.NextSort();
-			return;
-		}
-		if( !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() && CodeDetector::DetectAndAdjustMusicOptions(input.GameI.controller) )
-		{
-			m_soundOptionsChange.Play();
-			MESSAGEMAN->Broadcast( ssprintf("PlayerOptionsChangedP%i", pn+1) );
-			MESSAGEMAN->Broadcast( "SongOptionsChanged" );
-			return;
-		}
+		if( GAMESTATE->IsAnExtraStage() )
+			m_soundLocked.Play();
+		else
+			ChangeDifficulty( pn, -1 );
+		return;
+	}
+	if( CodeDetector::EnteredHarderDifficulty(input.GameI.controller) )
+	{
+		if( GAMESTATE->IsAnExtraStage() )
+			m_soundLocked.Play();
+		else
+			ChangeDifficulty( pn, +1 );
+		return;
+	}
+	if( CodeDetector::EnteredModeMenu(input.GameI.controller) )
+	{
+		if( MODE_MENU_AVAILABLE )
+			m_MusicWheel.ChangeSort( SORT_MODE_MENU );
+		else
+			m_soundLocked.Play();
+		return;
+	}
+	if( CodeDetector::EnteredNextSort(input.GameI.controller) )
+	{
+		if( ( GAMESTATE->IsExtraStage() && !PREFSMAN->m_bPickExtraStage ) || GAMESTATE->IsExtraStage2() )
+			m_soundLocked.Play();
+		else
+			m_MusicWheel.NextSort();
+		return;
+	}
+	if( !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() && CodeDetector::DetectAndAdjustMusicOptions(input.GameI.controller) )
+	{
+		m_soundOptionsChange.Play();
+		MESSAGEMAN->Broadcast( ssprintf("PlayerOptionsChangedP%i", pn+1) );
+		MESSAGEMAN->Broadcast( "SongOptionsChanged" );
+		return;
 	}
 
-	switch( input.MenuI )
-	{
-	case MENU_BUTTON_START:	MenuStart( input ); break;
-	}
+	if( input.MenuI == MENU_BUTTON_START )
+		MenuStart( input );
 }
 
 void ScreenSelectMusic::UpdateSelectButton()