mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
Twinaphex 2016-10-29 04:11:54 +02:00
parent 93af926f76
commit f2076e2c5b
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
menu/menu_event.c
View File

@ -85,9 +85,7 @@ void menu_event_keyboard_set(bool down, enum retro_key key)
unsigned i; unsigned i;
for (i = 0; i < RETROK_LAST; i++) for (i = 0; i < RETROK_LAST; i++)
{
menu_keyboard_key_state[i] = (menu_keyboard_key_state[i] & 1) << 1; menu_keyboard_key_state[i] = (menu_keyboard_key_state[i] & 1) << 1;
}
} }
else else
menu_keyboard_key_state[key] = ((menu_keyboard_key_state[key] & 1) << 1) | down; menu_keyboard_key_state[key] = ((menu_keyboard_key_state[key] & 1) << 1) | down;
@ -95,7 +93,6 @@ void menu_event_keyboard_set(bool down, enum retro_key key)
unsigned menu_event(uint64_t input, uint64_t trigger_input) unsigned menu_event(uint64_t input, uint64_t trigger_input)
{ {
unsigned i;
menu_animation_ctx_delta_t delta; menu_animation_ctx_delta_t delta;
float delta_time; float delta_time;
/* Used for key repeat */ /* Used for key repeat */
@ -257,9 +254,7 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input)
{ {
if (settings && settings->confirm_on_exit) if (settings && settings->confirm_on_exit)
{ {
if (menu_dialog_is_active()) if (!menu_dialog_is_active() && content_is_inited())
should_we_quit = false;
else if (content_is_inited())
{ {
if(menu_display_toggle_get_reason() != MENU_TOGGLE_REASON_USER) if(menu_display_toggle_get_reason() != MENU_TOGGLE_REASON_USER)
menu_display_toggle_set_reason(MENU_TOGGLE_REASON_MESSAGE); menu_display_toggle_set_reason(MENU_TOGGLE_REASON_MESSAGE);