Skip to content

Commit 5653d0d

Browse files
authored
EDIT_SETTINGS_MENU bug fix for OS7 & 8 (#842)
Users get stuck in wrong menu using the "Cancel" control, was reported on theCrucible, hadn't been noticed or reported prior but should probably be applied to OS7 as a bug fix on top on including in OS8.
1 parent ac508b0 commit 5653d0d

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

props/saber_fett263_buttons.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5657,7 +5657,11 @@ SaberFett263Buttons() : PropBase() {}
56575657
sound_library_.SayExit();
56585658
menu_ = false;
56595659
} else {
5660+
#ifdef FETT263_EDIT_SETTINGS_MENU
5661+
menu_type_ = MENU_SETTING_SUB;
5662+
#else
56605663
menu_type_ = MENU_TOP;
5664+
#endif
56615665
MenuCancel();
56625666
}
56635667
return true;
@@ -6106,7 +6110,11 @@ case EVENTID(BUTTON_POWER, EVENT_FOURTH_HELD_LONG, MODE_OFF):
61066110
sound_library_.SayExit();
61076111
menu_ = false;
61086112
} else {
6113+
#ifdef FETT263_EDIT_SETTINGS_MENU
6114+
menu_type_ = MENU_SETTING_SUB;
6115+
#else
61096116
menu_type_ = MENU_TOP;
6117+
#endif
61106118
MenuCancel();
61116119
}
61126120
return true;

0 commit comments

Comments
 (0)