diff --git a/stepmania/src/ScreenOptionsEditCourse.cpp b/stepmania/src/ScreenOptionsEditCourse.cpp index 6d2b3dd7ea..f07f8d151f 100644 --- a/stepmania/src/ScreenOptionsEditCourse.cpp +++ b/stepmania/src/ScreenOptionsEditCourse.cpp @@ -250,6 +250,9 @@ void ScreenOptionsEditCourse::ExportOptions( int iRow, const vectorm_MasterPlayerNumber]; Course *pCourse = GAMESTATE->m_pCurCourse; diff --git a/stepmania/src/ScreenOptionsEditProfile.cpp b/stepmania/src/ScreenOptionsEditProfile.cpp index 441afc6e5a..6f95f08931 100644 --- a/stepmania/src/ScreenOptionsEditProfile.cpp +++ b/stepmania/src/ScreenOptionsEditProfile.cpp @@ -126,6 +126,9 @@ void ScreenOptionsEditProfile::AfterChangeValueInRow( int iRow, PlayerNumber pn void ScreenOptionsEditProfile::ProcessMenuStart( const InputEventPlus &input ) { + if( IsTransitioning() ) + return; + int iRow = GetCurrentRow();; //OptionRow &row = *m_pRows[iRow]; diff --git a/stepmania/src/ScreenOptionsManageCourses.cpp b/stepmania/src/ScreenOptionsManageCourses.cpp index 90b73e627b..0ad8cd1582 100644 --- a/stepmania/src/ScreenOptionsManageCourses.cpp +++ b/stepmania/src/ScreenOptionsManageCourses.cpp @@ -343,6 +343,9 @@ static LocalizedString YOU_HAVE_MAXIMUM_EDITS_ALLOWED( "ScreenOptionsManageCours static LocalizedString YOU_MUST_DELETE( "ScreenOptionsManageCourses", "You must delete an existing course edit before creating a new course edit." ); void ScreenOptionsManageCourses::ProcessMenuStart( const InputEventPlus &input ) { + if( IsTransitioning() ) + return; + int iCurRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber]; if( iCurRow == 0 ) // "create new" diff --git a/stepmania/src/ScreenOptionsManageEditSteps.cpp b/stepmania/src/ScreenOptionsManageEditSteps.cpp index de318355e3..c743d53c82 100644 --- a/stepmania/src/ScreenOptionsManageEditSteps.cpp +++ b/stepmania/src/ScreenOptionsManageEditSteps.cpp @@ -237,6 +237,9 @@ static LocalizedString YOU_HAVE_MAX_STEP_EDITS( "ScreenOptionsManageEditSteps", static LocalizedString YOU_MUST_DELETE( "ScreenOptionsManageEditSteps", "You must delete an existing steps edit before creating a new steps edit." ); void ScreenOptionsManageEditSteps::ProcessMenuStart( const InputEventPlus &input ) { + if( IsTransitioning() ) + return; + int iCurRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber]; if( iCurRow == 0 ) // "create new" diff --git a/stepmania/src/ScreenOptionsManageProfiles.cpp b/stepmania/src/ScreenOptionsManageProfiles.cpp index a7781f3996..26a3e3eb89 100644 --- a/stepmania/src/ScreenOptionsManageProfiles.cpp +++ b/stepmania/src/ScreenOptionsManageProfiles.cpp @@ -287,6 +287,9 @@ void ScreenOptionsManageProfiles::AfterChangeRow( PlayerNumber pn ) void ScreenOptionsManageProfiles::ProcessMenuStart( const InputEventPlus &input ) { + if( IsTransitioning() ) + return; + int iCurRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber]; OptionRow &row = *m_pRows[iCurRow]; diff --git a/stepmania/src/ScreenOptionsMemoryCard.cpp b/stepmania/src/ScreenOptionsMemoryCard.cpp index f51a900024..62c6e6b124 100644 --- a/stepmania/src/ScreenOptionsMemoryCard.cpp +++ b/stepmania/src/ScreenOptionsMemoryCard.cpp @@ -171,6 +171,9 @@ void ScreenOptionsMemoryCard::SelectRowWithMemoryCard( const RString &sOsMountPo static LocalizedString ERROR_MOUNTING_CARD ("ScreenOptionsMemoryCard", "Error mounting card: %s" ); void ScreenOptionsMemoryCard::ProcessMenuStart( const InputEventPlus &input ) { + if( IsTransitioning() ) + return; + int iCurRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber]; const vector &v = m_CurrentUsbStorageDevices;