Merge pull request #8035 from orbea/fix

Fix conflicting types.
This commit is contained in:
Twinaphex 2019-01-18 20:22:00 +01:00 committed by GitHub
commit b4348e3ae1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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))