From b8f8f159c5b619c17003d39632eb72d9351f7c83 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 8 Oct 2016 18:41:51 +0200 Subject: [PATCH] Get rid of unnecesary wrapper function --- runloop.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/runloop.c b/runloop.c index a2161d523f..db2b50289d 100644 --- a/runloop.c +++ b/runloop.c @@ -405,13 +405,6 @@ static bool rarch_game_specific_options(char **output) return true; } -static bool runloop_is_focused(void) -{ - settings_t *settings = config_get_ptr(); - if (settings && settings->pause_nonactive) - return video_driver_is_focused(); - return true; -} static bool runloop_check_pause_state(event_cmd_state_t *cmd) { @@ -441,7 +434,9 @@ static bool runloop_check_pause_state(event_cmd_state_t *cmd) static bool runloop_check_idle_state(event_cmd_state_t *cmd) { - bool focused = runloop_is_focused(); + settings_t *settings = config_get_ptr(); + bool focused = (settings && + settings->pause_nonactive) ? video_driver_is_focused() : true; runloop_check_pause(focused, runloop_cmd_triggered(cmd, RARCH_PAUSE_TOGGLE), @@ -1137,10 +1132,12 @@ static int runloop_iterate_menu(enum menu_action action, unsigned *sleep_ms) { menu_ctx_iterate_t iter; settings_t *settings = config_get_ptr(); - bool focused = runloop_is_focused() && - !ui_companion_is_on_foreground(); + bool focused = (settings && + settings->pause_nonactive) ? video_driver_is_focused() : true; bool is_idle = runloop_ctl(RUNLOOP_CTL_IS_IDLE, NULL); + focused = focused && !ui_companion_is_on_foreground(); + iter.action = action; if (!menu_driver_ctl(RARCH_MENU_CTL_ITERATE, &iter))