From 59ad1baea7500abd85a4ba2de160373de1d80dff Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 19 Nov 2013 02:12:09 +0100
Subject: [PATCH] (RMenu Disp) init_assets - calloc menu_texture

---
 frontend/menu/disp/rmenu.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/menu/disp/rmenu.c b/frontend/menu/disp/rmenu.c
index a47ad8867c..63d24b0c85 100644
--- a/frontend/menu/disp/rmenu.c
+++ b/frontend/menu/disp/rmenu.c
@@ -400,6 +400,11 @@ void rmenu_set_texture(void *data, bool enable)
 static void rmenu_init_assets(void *data)
 {
    rgui_handle_t *rgui = (rgui_handle_t*)data;
+
+   if (!rgui)
+      return;
+
+   menu_texture = (struct texture_image*)calloc(1, sizeof(*menu_texture));
    texture_image_load(g_extern.menu_texture_path, menu_texture);
    rgui->width = menu_texture->width;
    rgui->height = menu_texture->height;
@@ -411,8 +416,6 @@ static void *rmenu_init(void)
 {
    rgui_handle_t *rgui = (rgui_handle_t*)calloc(1, sizeof(*rgui));
 
-   menu_texture = (struct texture_image*)calloc(1, sizeof(*menu_texture));
-
    rmenu_init_assets(rgui);
 
    return rgui;
@@ -432,13 +435,14 @@ static void rmenu_free_assets(void *data)
       menu_texture->pixels = NULL;
    }
 #else
-   if (menu_texture)
+   if (menu_texture->pixels)
    {
       free(menu_texture->pixels);
       menu_texture->pixels = NULL;
    }
-   menu_texture_inited = false;
 #endif
+
+   menu_texture_inited = false;
 }
 
 static void rmenu_free(void *data)