From c30901d70334f7102a741e1ebd4c0991b6c6fd4c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 12 Nov 2003 16:15:54 +0000 Subject: [PATCH] fix style selections in ScreenTitleMenu --- stepmania/src/ScreenTitleMenu.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index db216c984d..9400287f8a 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -243,10 +243,12 @@ void ScreenTitleMenu::Input( const DeviceInput& DeviceI, const InputEventType ty m_Menu.Back( SM_GoToAttractLoop ); break; case MENU_BUTTON_START: + if( !Screen::JoinInput( DeviceI, type, GameI, MenuI, StyleI ) ) + return; + /* return if the choice is invalid */ const ModeChoice &mc = m_aModeChoices[m_Choice]; CString why; - if( !mc.IsPlayable( &why ) ) { m_soundInvalid.Play(); @@ -255,9 +257,8 @@ void ScreenTitleMenu::Input( const DeviceInput& DeviceI, const InputEventType ty return; } - if( Screen::JoinInput( DeviceI, type, GameI, MenuI, StyleI ) ) - if( !m_Menu.m_Out.IsTransitioning() ) - m_Menu.StartTransitioning( SM_GoToNextScreen ); + if( !m_Menu.m_Out.IsTransitioning() ) + m_Menu.StartTransitioning( SM_GoToNextScreen ); } // detect codes