From b3422795477562664e7d21aafe5b93944eec3c9f Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Fri, 15 Sep 2006 02:53:15 +0000 Subject: [PATCH] Fix back. Simplify. --- stepmania/src/ScreenSelectMusic.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 35a9106d32..e16228cd57 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -440,13 +440,8 @@ void ScreenSelectMusic::Input( const InputEventPlus &input ) case MENU_BUTTON_DOWN: this->MenuDown( input ); break; case MENU_BUTTON_LEFT: this->MenuLeft( input ); break; case MENU_BUTTON_RIGHT: this->MenuRight( input ); break; - case MENU_BUTTON_BACK: - /* Don't make the user hold the back button if they're pressing escape and escape is the back button. */ - if( input.DeviceI.device == DEVICE_KEYBOARD && input.DeviceI.button == KEY_ESC ) - this->MenuBack( input ); - else - ScreenWithMenuElements::MenuBack( input ); - break; + // Screen contains the delayed back logic. + case MENU_BUTTON_BACK: Screen::Input( input ); break; // Do the default handler for Start after detecting codes. // case MENU_BUTTON_START: this->MenuStart( input ); break; case MENU_BUTTON_COIN: this->MenuCoin( input ); break;