From f16a065cdd1b032d0b8d8139dcc8902d47a21894 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 18 Sep 2014 04:04:33 +0200
Subject: [PATCH] Fixes 'block hotkey enable'

---
 driver.h                    | 2 --
 frontend/menu/menu_common.c | 2 --
 input/input_common.h        | 7 ++++++-
 retroarch.c                 | 2 --
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/driver.h b/driver.h
index 434b596dc1..e27cbae24a 100644
--- a/driver.h
+++ b/driver.h
@@ -667,8 +667,6 @@ extern menu_ctx_driver_t menu_ctx_lakka;
 extern menu_ctx_driver_backend_t menu_ctx_backend_common;
 extern menu_ctx_driver_backend_t menu_ctx_backend_lakka;
 
-#define check_block_hotkey_func(input) rarch_check_block_hotkey(BIND_PRESSED(input, RARCH_ENABLE_HOTKEY))
-
 #define check_netplay_flip_func(trigger_input) check_netplay_flip(BIND_PRESSED(trigger_input, RARCH_NETPLAY_FLIP), BIND_PRESSED(trigger_input, RARCH_FULLSCREEN_TOGGLE_KEY))
 #define check_overlay_func(input, old_input) rarch_check_overlay(BIND_PRESSED(input, RARCH_OVERLAY_NEXT), BIND_PRESSED(old_input, RARCH_OVERLAY_NEXT))
 #define check_oneshot_func(trigger_input) check_oneshot(BIND_PRESSED(trigger_input, RARCH_FRAMEADVANCE), BIND_PRESSED(trigger_input, RARCH_REWIND))
diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index e397ae0621..42d7df1885 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -324,8 +324,6 @@ bool menu_iterate(void)
          RARCH_BIND_LIST_END, &old_state);
 
    trigger_input = input & ~old_state;
-
-   check_block_hotkey_func(input);
 #ifdef HAVE_OVERLAY
    if (BIND_PRESSED(trigger_input, RARCH_OVERLAY_NEXT))
          input_overlay_next(driver.overlay);
diff --git a/input/input_common.h b/input/input_common.h
index 54941d3e94..8af3b7b83a 100644
--- a/input/input_common.h
+++ b/input/input_common.h
@@ -18,6 +18,7 @@
 
 #include "../driver.h"
 #include "../conf/config_file.h"
+#include "../general.h"
 #include <stdint.h>
 
 #ifdef __cplusplus
@@ -196,7 +197,6 @@ void input_push_analog_dpad(struct retro_keybind *binds, unsigned mode);
 
 void input_pop_analog_dpad(struct retro_keybind *binds);
 
-
 /* Returns a 64-bit mask of all pressed buttons, starting
  * from the specified key up until the last queryable key
  * (key_end).
@@ -213,6 +213,11 @@ static inline retro_input_t input_keys_pressed_func(unsigned key,
    retro_input_t ret = 0;
    *old_state = old_ret;
 
+#ifdef RARCH_INTERNAL
+   rarch_check_block_hotkey(driver.input->key_pressed(driver.input_data,
+            RARCH_ENABLE_HOTKEY));
+#endif
+
    for (; key < key_end; key++)
    {
       bool state = false;
diff --git a/retroarch.c b/retroarch.c
index b62a348471..28a34fdc35 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2783,8 +2783,6 @@ static void do_state_checks(
       retro_input_t input, retro_input_t old_input,
       retro_input_t trigger_input)
 {
-   check_block_hotkey_func(input);
-
    if (BIND_PRESSED(trigger_input, RARCH_SCREENSHOT))
       rarch_main_command(RARCH_CMD_TAKE_SCREENSHOT);