From 8787f46c59dd6bbf7aa5c2aae9672902034c84bd Mon Sep 17 00:00:00 2001 From: orbea Date: Thu, 17 Jan 2019 19:58:44 -0800 Subject: [PATCH] Fix conflicting types. Fixes conflicting types after PR https://github.com/libretro/RetroArch/pull/8006 --- retroarch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/retroarch.c b/retroarch.c index c9b29d290c..b523c6d747 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2582,6 +2582,7 @@ static enum runloop_state runloop_check_state( #endif static bool old_quit_key = false; static bool quit_key = false; + static bool trig_quit_key = false; static bool runloop_exec = false; static bool old_focus = true; bool is_focused = false; @@ -2720,10 +2721,9 @@ static enum runloop_state runloop_check_state( /* Check quit key */ { - bool quit_key = BIT256_GET( + quit_key = BIT256_GET( current_input, RARCH_QUIT_KEY); - bool trig_quit_key = quit_key && !old_quit_key; - + trig_quit_key = quit_key && !old_quit_key; old_quit_key = quit_key; if (time_to_exit(trig_quit_key))