From 0ec6ef75dfee23832a1a5a826885d0c60c07cdee Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 1 Jan 2017 04:17:58 +0100 Subject: [PATCH] Move early return check to input_driver.c --- input/input_driver.c | 2 +- input/input_overlay.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/input/input_driver.c b/input/input_driver.c index 61e0b1e922..570cd152fe 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -287,7 +287,7 @@ void input_poll(void) } #ifdef HAVE_OVERLAY - if (overlay_ptr) + if (overlay_ptr && input_overlay_is_alive(overlay_ptr)) input_poll_overlay(overlay_ptr, settings->input.overlay_opacity); #endif diff --git a/input/input_overlay.c b/input/input_overlay.c index d94a3ca2c9..4d79d1ad4a 100644 --- a/input/input_overlay.c +++ b/input/input_overlay.c @@ -604,12 +604,7 @@ void input_poll_overlay(input_overlay_t *ol, float opacity) uint16_t key_mod = 0; bool polled = false; settings_t *settings = config_get_ptr(); - input_overlay_state_t *ol_state = NULL; - - if (!input_overlay_is_alive(ol)) - return; - - ol_state = &ol->overlay_state; + input_overlay_state_t *ol_state = &ol->overlay_state; if (!ol_state) return;