From 94856393a9a94e4f385595826a3e9c5069f0d9f1 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 15 Feb 2015 01:03:19 +0100 Subject: [PATCH] Change signature of check_block_hotkey --- runloop.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/runloop.c b/runloop.c index 1d58091b07..7ea59670a3 100644 --- a/runloop.c +++ b/runloop.c @@ -729,7 +729,7 @@ static void limit_frame_time(void) * * Checks if 'hotkey enable' key is pressed. **/ -static void check_block_hotkey(bool enable_hotkey) +static bool check_block_hotkey(bool enable_hotkey) { bool use_hotkey_enable; static const struct retro_keybind *bind = @@ -754,7 +754,7 @@ static void check_block_hotkey(bool enable_hotkey) /* If we hold ENABLE_HOTKEY button, block all libretro input to allow * hotkeys to be bound to same keys as RetroPad. */ - driver.block_libretro_input = use_hotkey_enable && enable_hotkey; + return (use_hotkey_enable && enable_hotkey); } /** @@ -797,7 +797,8 @@ static inline retro_input_t input_keys_pressed(void) g_extern.turbo_count++; - check_block_hotkey(driver.input->key_pressed(driver.input_data, + driver.block_libretro_input = check_block_hotkey( + driver.input->key_pressed(driver.input_data, RARCH_ENABLE_HOTKEY)); for (i = 0; i < g_settings.input.max_users; i++)