From e8eb0ef013eb8e354e81b6c1fb9c3681dfa12c1f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 27 May 2016 19:34:07 +0200
Subject: [PATCH] Change invocation of task_content_push
---
menu/cbs/menu_cbs_ok.c | 2 +-
tasks/task_content.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index ddb5cf657f..63cc546a82 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -2073,7 +2073,7 @@ static int action_ok_start_net_retropad_core(const char *path,
{
content_ctx_info_t content_info = {0};
task_push_content_load_default(NULL, NULL,
- &content_info, CORE_TYPE_PLAIN,
+ &content_info, CORE_TYPE_NETRETROPAD,
CONTENT_MODE_LOAD_NOTHING_WITH_NET_RETROPAD_CORE_FROM_MENU,
NULL, NULL);
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 33a621a497..2bd7e59617 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -1754,7 +1754,6 @@ bool task_push_content_load_default(
core_path = settings->path.libretro; /* TODO/FIXME */
runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL);
runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path);
- retroarch_set_current_core_type(CORE_TYPE_NET_RETROPAD);
#ifdef HAVE_DYNAMIC
command_event(CMD_EVENT_LOAD_CORE, NULL);
#endif