From 47cb3b899a0d4db14b270eeabb1c02f306563fee Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Tue, 17 May 2016 08:53:25 +0200 Subject: [PATCH] Fix deferred content loaded from menu --- tasks/task_content.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tasks/task_content.c b/tasks/task_content.c index b50e8a1793..06588daa9a 100644 --- a/tasks/task_content.c +++ b/tasks/task_content.c @@ -1967,6 +1967,22 @@ bool rarch_task_push_content_load_default( void *user_data) { settings_t *settings = config_get_ptr(); + +#ifdef HAVE_MENU + switch (mode) + { + case CONTENT_MODE_LOAD_NOTHING_WITH_CURRENT_CORE_FROM_MENU: + case CONTENT_MODE_LOAD_CONTENT_FROM_PLAYLIST_FROM_MENU: + case CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_MENU: + case CONTENT_MODE_LOAD_CONTENT_WITH_FFMPEG_CORE_FROM_MENU: + case CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_MENU: + case CONTENT_MODE_LOAD_CONTENT_WITH_IMAGEVIEWER_CORE_FROM_MENU: + content_info->environ_get = menu_content_environment_get; + break; + default: + break; + } +#endif switch (mode) {