From 7f339a8f84b159e4b3a5ff9011d4c55ea8dc76cb Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 27 Nov 2016 15:12:48 +0100
Subject: [PATCH] More hacks from input_overlay.c removed

---
 input/input_driver.c  |  2 +-
 input/input_overlay.c | 11 +++--------
 menu/menu_event.c     |  2 +-
 menu/menu_input.c     |  4 ++--
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/input/input_driver.c b/input/input_driver.c
index f8fa558c60..6f1d2bd775 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -408,7 +408,7 @@ void input_poll(void)
    }
 
 #ifdef HAVE_OVERLAY
-   input_poll_overlay(NULL, settings->input.overlay_opacity);
+   input_poll_overlay(overlay_ptr, settings->input.overlay_opacity);
 #endif
 
 #ifdef HAVE_COMMAND
diff --git a/input/input_overlay.c b/input/input_overlay.c
index d161f61c58..ed73fb3bb5 100644
--- a/input/input_overlay.c
+++ b/input/input_overlay.c
@@ -584,11 +584,9 @@ void input_overlay_set_alpha_mod(float mod)
 
 bool input_overlay_is_alive(input_overlay_t *ol)
 {
-   if (!ol)
-      ol = overlay_ptr;
-   if (!ol)
-      return false;
-   return ol->alive;
+   if (ol)
+      return ol->alive;
+   return false;
 }
 
 bool input_overlay_key_pressed(int key)
@@ -614,9 +612,6 @@ void input_poll_overlay(input_overlay_t *ol, float opacity)
    settings_t *settings            = config_get_ptr();
    input_overlay_state_t *ol_state = NULL;
    
-   if (!ol)
-      ol = overlay_ptr;
-
    if (!input_overlay_is_alive(ol))
       return;
 
diff --git a/menu/menu_event.c b/menu/menu_event.c
index a84732f2ff..a8e7b501da 100644
--- a/menu/menu_event.c
+++ b/menu/menu_event.c
@@ -394,7 +394,7 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input)
 #ifdef HAVE_OVERLAY
    if (!mouse_enabled)
       mouse_enabled = !(settings->input.overlay_enable
-            && input_overlay_is_alive(NULL));
+            && input_overlay_is_alive(overlay_ptr));
 #endif
 
    if (!(menu_input = menu_input_get_ptr()))
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 3cf8144cae..e2476c7744 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -127,7 +127,7 @@ static int menu_input_mouse_post_iterate(uint64_t *input_mouse,
    if (
          !settings->menu.mouse.enable
 #ifdef HAVE_OVERLAY
-         || (settings->input.overlay_enable && input_overlay_is_alive(NULL))
+         || (settings->input.overlay_enable && input_overlay_is_alive(overlay_ptr))
 #endif
          )
    {
@@ -376,7 +376,7 @@ static int menu_input_pointer_post_iterate(
 #ifdef HAVE_OVERLAY
    if (!check_overlay)
       check_overlay = (settings->input.overlay_enable 
-            && input_overlay_is_alive(NULL));
+            && input_overlay_is_alive(overlay_ptr));
 #endif
 
    if (check_overlay)