From 4d30d931feff6f49f243b96a2ee623845a1d4080 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 16 May 2016 14:33:50 +0200 Subject: [PATCH] Move some logic to rarch_task_push_content_load_default --- menu/cbs/menu_cbs_ok.c | 1 - tasks/task_content.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index f3f7d73a58..83c14713ed 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -2048,7 +2048,6 @@ static int action_ok_start_core(const char *path, /* No content needed for this core, load core immediately. */ if (menu_driver_ctl(RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL)) { - runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL); rarch_task_push_content_load_default(NULL, NULL, false, CORE_TYPE_PLAIN, CONTENT_MODE_LOAD_NOTHING_WITH_CURRENT_CORE_FROM_MENU, diff --git a/tasks/task_content.c b/tasks/task_content.c index baa4b88f4d..d6bf9314b7 100644 --- a/tasks/task_content.c +++ b/tasks/task_content.c @@ -73,6 +73,7 @@ bool rarch_task_push_content_load_default( case CONTENT_MODE_LOAD_NOTHING_WITH_DUMMY_CORE: break; case CONTENT_MODE_LOAD_NOTHING_WITH_CURRENT_CORE_FROM_MENU: + runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL); break; case CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_MENU: break;