From 3880856c94e1d32047d6d0fa89a4c9af52c51f70 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 10 Feb 2015 03:05:58 +0100
Subject: [PATCH] Make rarch_defer_core more robust for 'load_game'

---
 retroarch.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/retroarch.c b/retroarch.c
index 22fd462f27..80f029bf3b 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -3224,8 +3224,13 @@ int rarch_defer_core(core_info_list_t *core_info, const char *dir,
 
    if (!strcmp(menu_label, "load_content"))
    {
-      strlcpy(new_core_path, g_extern.core_info_current->path, sizeof(new_core_path));
-      supported = 1;
+      info = (const core_info_t*)&g_extern.core_info_current;
+
+      if (info)
+      {
+         strlcpy(new_core_path, info->path, sizeof(new_core_path));
+         supported = 1;
+      }
    }
    else
       strlcpy(new_core_path, info->path, sizeof(new_core_path));