ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rewrite menu toggle check

This commit is contained in:
twinaphex 2017-05-21 13:54:17 +02:00
parent d08b785f9d
commit 759b963c2f
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
retroarch.c
View File

@ -2402,34 +2402,43 @@ static enum runloop_state runloop_check_state(
} }
#ifdef HAVE_MENU #ifdef HAVE_MENU
if (menu_event_kb_is_set(RETROK_F1) == 1) /* Check menu toggle */
{ {
if (menu_driver_is_alive()) static bool old_pressed = false;
bool pressed = runloop_cmd_press(
current_input, RARCH_MENU_TOGGLE);
if (menu_event_kb_is_set(RETROK_F1) == 1)
{ {
if (rarch_is_inited && (current_core_type != CORE_TYPE_DUMMY)) if (menu_driver_is_alive())
{ {
rarch_menu_running_finished(); if (rarch_is_inited && (current_core_type != CORE_TYPE_DUMMY))
menu_event_kb_set(false, RETROK_F1); {
rarch_menu_running_finished();
menu_event_kb_set(false, RETROK_F1);
}
} }
} }
} else if ((!menu_event_kb_is_set(RETROK_F1) &&
else if ((!menu_event_kb_is_set(RETROK_F1) && (pressed && !old_pressed)) ||
runloop_cmd_triggered(trigger_input, RARCH_MENU_TOGGLE)) || (current_core_type == CORE_TYPE_DUMMY))
(current_core_type == CORE_TYPE_DUMMY))
{
if (menu_driver_is_alive())
{ {
if (rarch_is_inited && (current_core_type != CORE_TYPE_DUMMY)) if (menu_driver_is_alive())
rarch_menu_running_finished(); {
if (rarch_is_inited && (current_core_type != CORE_TYPE_DUMMY))
rarch_menu_running_finished();
}
else
{
menu_display_toggle_set_reason(MENU_TOGGLE_REASON_USER);
rarch_menu_running();
}
} }
else else
{ menu_event_kb_set(false, RETROK_F1);
menu_display_toggle_set_reason(MENU_TOGGLE_REASON_USER);
rarch_menu_running(); old_pressed = pressed;
}
} }
else
menu_event_kb_set(false, RETROK_F1);
if (menu_driver_is_alive()) if (menu_driver_is_alive())
{ {