From b74aaa25cef397d923d515e083db7463c5f0325e Mon Sep 17 00:00:00 2001 From: Themaister Date: Sat, 11 Jan 2014 12:13:41 +0100 Subject: [PATCH] Only block input driver hotkey handling. Don't block overlay and command input when input_hotkey_enable is set. --- driver_funcs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/driver_funcs.h b/driver_funcs.h index ac82b49411..54f42a372c 100644 --- a/driver_funcs.h +++ b/driver_funcs.h @@ -56,13 +56,13 @@ static inline bool input_key_pressed_func(int key) { - if (driver.block_hotkey) - return false; + bool ret = false; - bool ret = driver.input->key_pressed(driver.input_data, key); + if (!driver.block_hotkey) + ret = ret || driver.input->key_pressed(driver.input_data, key); #ifdef HAVE_OVERLAY - ret |= driver.overlay_state.buttons & (UINT64_C(1) << key); + ret = ret || (driver.overlay_state.buttons & (1ULL << key)); #endif #ifdef HAVE_COMMAND