mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-26 18:35:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use QUICKMENU for RGUI.

Browse Source 
Doesn't seem to be used.
This commit is contained in:
Themaister 2013-03-16 11:11:36 +01:00
parent 8f6f35b2d9
commit 0b8d8c41f7
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.def.h
View File

@ -618,8 +618,9 @@ static const struct retro_keybind retro_keybinds_1[] = {
{ true, RARCH_OVERLAY_NEXT, RETRO_LBL_OVERLAY_NEXT, RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE }, { true, RARCH_OVERLAY_NEXT, RETRO_LBL_OVERLAY_NEXT, RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
{ true, RARCH_DISK_EJECT_TOGGLE, RETRO_LBL_DISK_EJECT_TOGGLE, RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE }, { true, RARCH_DISK_EJECT_TOGGLE, RETRO_LBL_DISK_EJECT_TOGGLE, RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
{ true, RARCH_DISK_NEXT, RETRO_LBL_DISK_NEXT, RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE }, { true, RARCH_DISK_NEXT, RETRO_LBL_DISK_NEXT, RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
#ifdef HAVE_RGUI
{ true, RARCH_MENU_TOGGLE, RETRO_LBL_MENU_TOGGLE, RETROK_F1, NO_BTN, 0, AXIS_NONE }, { true, RARCH_MENU_TOGGLE, RETRO_LBL_MENU_TOGGLE, RETROK_F1, NO_BTN, 0, AXIS_NONE },
{ true, RARCH_MENU_QUICKMENU_TOGGLE, RETRO_LBL_MENU_QUICKMENU_TOGGLE,RETROK_F1, NO_BTN, 0, AXIS_NONE }, #endif
}; };
// Player 2-5 // Player 2-5

4
retroarch.c
View File

@ -2848,7 +2848,6 @@ error:
return 1; return 1;
} }
#ifdef HAVE_RGUI
static inline bool check_enter_rgui(void) static inline bool check_enter_rgui(void)
{ {
static bool old_rmenu_toggle = true; static bool old_rmenu_toggle = true;
@ -2869,7 +2868,6 @@ static inline bool check_enter_rgui(void)
return false; return false;
} }
} }
#endif
bool rarch_main_iterate(void) bool rarch_main_iterate(void)
{ {
@ -2893,10 +2891,8 @@ bool rarch_main_iterate(void)
return false; return false;
} }
#ifdef HAVE_RGUI
if (check_enter_rgui()) if (check_enter_rgui())
return false; // Enter menu, don't exit. return false; // Enter menu, don't exit.
#endif
#ifdef HAVE_COMMAND #ifdef HAVE_COMMAND
if (driver.command) if (driver.command)