From e6e59c6017c6e865459ee3a51443a2b6ffd29eab Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 12 Mar 2015 17:09:03 +0100
Subject: [PATCH] (XMB) xmb_get_userdata_from_core - more refactors

---
 menu/drivers/xmb.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index a756933d09..610de117c1 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -745,10 +745,14 @@ static xmb_node_t* xmb_get_userdata_from_core(xmb_handle_t *xmb, core_info_t *in
    if (!info)
       return NULL;
 
-   node = (xmb_node_t*)info->userdata;
+   if (!info->userdata)
+   {
+      info->userdata = xmb_node_allocate_userdata(xmb, info, i);
+      if (!info->userdata)
+         return NULL;
+   }
 
-   if (!node)
-      return xmb_node_allocate_userdata(xmb, info, i);
+   node = (xmb_node_t*)info->userdata;
 
    return node;
 }