From a5cf78fd6880f5896d3cd5f4712c9bddf6e5b952 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 17 May 2016 10:35:57 +0200 Subject: [PATCH] only bind to menu_environment_get when content_info->environ_get is NULL --- tasks/task_content.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tasks/task_content.c b/tasks/task_content.c index 93c845c022..cd2d6b0112 100644 --- a/tasks/task_content.c +++ b/tasks/task_content.c @@ -1978,7 +1978,8 @@ bool rarch_task_push_content_load_default( case CONTENT_MODE_LOAD_CONTENT_WITH_IMAGEVIEWER_CORE_FROM_MENU: case CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_COMPANION_UI: case CONTENT_MODE_LOAD_NOTHING_WITH_DUMMY_CORE: - content_info->environ_get = menu_content_environment_get; + if (content_info && !content_info->environ_get) + content_info->environ_get = menu_content_environment_get; break; default: break;