From 0e467f99edc55e9fa62ca154ea3fb50ee8b51c09 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 15 May 2015 14:42:55 +0200
Subject: [PATCH] (Menu) Refactor

---
 driver.c    | 1 -
 menu/menu.c | 4 +++-
 menu/menu.h | 8 --------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/driver.c b/driver.c
index d74eb55417..2535ac77c8 100644
--- a/driver.c
+++ b/driver.c
@@ -450,7 +450,6 @@ void uninit_drivers(int flags)
 
       if (!driver->menu_data_own)
       {
-         menu_free_list(driver->menu);
          menu_free(driver->menu);
          driver->menu = NULL;
       }
diff --git a/menu/menu.c b/menu/menu.c
index ca0d288feb..75b5111379 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -194,7 +194,7 @@ error:
  *
  * Frees menu lists.
  **/
-void menu_free_list(menu_handle_t *menu)
+static void menu_free_list(menu_handle_t *menu)
 {
    if (!menu)
       return;
@@ -215,6 +215,8 @@ void menu_free(menu_handle_t *menu)
 
    if (!menu)
       return;
+
+   menu_free_list(menu);
   
 #ifdef HAVE_SHADER_MANAGER
    if (menu->shader)
diff --git a/menu/menu.h b/menu/menu.h
index 6528d7f2e4..577713391e 100644
--- a/menu/menu.h
+++ b/menu/menu.h
@@ -154,14 +154,6 @@ typedef enum
  **/
 void *menu_init(const void *data);
 
-/**
- * menu_free_list:
- * @menu                     : Menu handle.
- *
- * Frees menu lists.
- **/
-void menu_free_list(menu_handle_t *menu);
-
 /**
  * menu_iterate:
  * @input                    : input sample for this frame