From 21244c6ec7ffc4c5879f8d4f2bc1af18e0dfadd4 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 11 Apr 2018 06:11:18 +0200
Subject: [PATCH] Revert "(Menu) Get rid of more RARCH_MENU_CTL_DRIVER_DATA_GET
 calls"

This reverts commit cb3b5d72abe87f95585f1aa460de5c97abdf407f.
---
 menu/drivers/menu_generic.c |  2 +-
 menu/menu_input.c           | 21 ++++++++++++++++-----
 menu/menu_input.h           |  3 +--
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c
index 3add7400e2..2424c888bd 100644
--- a/menu/drivers/menu_generic.c
+++ b/menu/drivers/menu_generic.c
@@ -254,7 +254,7 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action)
    }
 
    if (BIT64_GET(menu->state, MENU_STATE_POST_ITERATE))
-      menu_input_post_iterate(menu, &ret, action);
+      menu_input_post_iterate(&ret, action);
 
 end:
    if (ret)
diff --git a/menu/menu_input.c b/menu/menu_input.c
index a3929ce78f..a791ad83d3 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -210,7 +210,6 @@ static int menu_input_mouse_post_iterate(uint64_t *input_mouse,
 }
 
 static int menu_input_mouse_frame(
-      menu_handle_t *menu,
       menu_file_list_cbs_t *cbs, menu_entry_t *entry,
       unsigned action)
 {
@@ -288,6 +287,10 @@ static int menu_input_mouse_frame(
    if (BIT64_GET(mouse_state, MENU_MOUSE_ACTION_BUTTON_R))
    {
       size_t selection    = menu_navigation_get_selection();
+      menu_handle_t *menu = NULL;
+
+      menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu);
+
       menu_entry_action(entry, menu,
             (unsigned)selection,
             MENU_ACTION_CANCEL);
@@ -412,7 +415,6 @@ int16_t menu_input_mouse_state(enum menu_input_mouse_state state)
 }
 
 static int menu_input_pointer_post_iterate(
-      menu_handle_t *menu,
       menu_file_list_cbs_t *cbs,
       menu_entry_t *entry, unsigned action)
 {
@@ -526,6 +528,10 @@ static int menu_input_pointer_post_iterate(
                if (menu_input->pointer.counter > 32)
                {
                   size_t selection    = menu_navigation_get_selection();
+                  menu_handle_t *menu = NULL;
+
+                  menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu);
+
                   if (cbs && cbs->action_start)
                      return menu_entry_action(entry, menu,
                            (unsigned)selection,
@@ -558,7 +564,11 @@ static int menu_input_pointer_post_iterate(
    {
       if (!pointer_oldback)
       {
+         menu_handle_t *menu = NULL;
          pointer_oldback     = true;
+
+         menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu);
+
          menu_entry_action(entry, menu,
                (unsigned)menu_navigation_get_selection(),
                MENU_ACTION_CANCEL);
@@ -570,7 +580,7 @@ static int menu_input_pointer_post_iterate(
    return ret;
 }
 
-void menu_input_post_iterate(void *data, int *ret, unsigned action)
+void menu_input_post_iterate(int *ret, unsigned action)
 {
    menu_entry_t entry;
    settings_t *settings       = config_get_ptr();
@@ -582,10 +592,11 @@ void menu_input_post_iterate(void *data, int *ret, unsigned action)
    menu_entry_init(&entry);
    menu_entry_get(&entry, 0, selection, NULL, false);
 
-   *ret = menu_input_mouse_frame(data, cbs, &entry, action);
+   *ret = menu_input_mouse_frame(cbs, &entry, action);
 
    if (settings->bools.menu_pointer_enable)
-      *ret |= menu_input_pointer_post_iterate(data, cbs, &entry, action);
+      *ret |= menu_input_pointer_post_iterate(cbs, &entry, action);
 
    menu_entry_free(&entry);
 }
+
diff --git a/menu/menu_input.h b/menu/menu_input.h
index 1dd5dc669b..2c5694eb00 100644
--- a/menu/menu_input.h
+++ b/menu/menu_input.h
@@ -108,8 +108,7 @@ typedef struct menu_input_ctx_hitbox
    int32_t y2;
 } menu_input_ctx_hitbox_t;
 
-void menu_input_post_iterate(void *data,
-      int *ret, unsigned action);
+void menu_input_post_iterate(int *ret, unsigned action);
 
 int16_t menu_input_pointer_state(enum menu_input_pointer_state state);