From 204f0183e1afcc20221f9ef298788adf8f459282 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 17 May 2017 05:06:52 +0200 Subject: [PATCH] Header cleanups --- menu/menu_driver.c | 3 --- menu/menu_input.h | 3 --- menu/widgets/menu_input_bind_dialog.c | 2 ++ retroarch.c | 4 ++++ 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/menu/menu_driver.c b/menu/menu_driver.c index bf503fefc8..73042ea62b 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -302,9 +302,6 @@ static void menu_driver_toggle(bool on) if (key_event && frontend_key_event) *key_event = *frontend_key_event; } - - /* Prevent stray input */ - input_driver_set_flushing_input(); } const char *menu_driver_ident(void) diff --git a/menu/menu_input.h b/menu/menu_input.h index 7efac468f3..d12f8f5f51 100644 --- a/menu/menu_input.h +++ b/menu/menu_input.h @@ -20,9 +20,6 @@ #include -#include "../input/input_driver.h" -#include "../input/input_keyboard.h" - RETRO_BEGIN_DECLS enum menu_action diff --git a/menu/widgets/menu_input_bind_dialog.c b/menu/widgets/menu_input_bind_dialog.c index 8e12e4d10d..197cdf8cc2 100644 --- a/menu/widgets/menu_input_bind_dialog.c +++ b/menu/widgets/menu_input_bind_dialog.c @@ -22,6 +22,8 @@ #include "../menu_driver.h" +#include "../../input/input_driver.h" +#include "../../input/input_keyboard.h" #include "../../input/input_config.h" #include "../../configuration.h" diff --git a/retroarch.c b/retroarch.c index e971256bc4..0666bab14b 100644 --- a/retroarch.c +++ b/retroarch.c @@ -1299,6 +1299,8 @@ void rarch_menu_running(void) { #ifdef HAVE_MENU menu_driver_ctl(RARCH_MENU_CTL_SET_TOGGLE, NULL); + /* Prevent stray input */ + input_driver_set_flushing_input(); #endif #ifdef HAVE_OVERLAY { @@ -1313,6 +1315,8 @@ void rarch_menu_running_finished(void) { #ifdef HAVE_MENU menu_driver_ctl(RARCH_MENU_CTL_UNSET_TOGGLE, NULL); + /* Prevent stray input */ + input_driver_set_flushing_input(); #endif video_driver_set_texture_enable(false, false); #ifdef HAVE_OVERLAY