From d681d3024942c34129def4658827daa085e1c598 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 16 May 2016 17:14:05 +0200
Subject: [PATCH] Move code to task_content.c

---
 runloop.c            | 10 +---------
 tasks/task_content.c |  9 +++++++++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/runloop.c b/runloop.c
index 6920cd1ae4..1835a36168 100644
--- a/runloop.c
+++ b/runloop.c
@@ -739,14 +739,7 @@ static bool runloop_is_frame_count_end(void)
 bool runloop_prepare_dummy(void)
 {
    content_ctx_info_t content_info = {0};
-   memset(&runloop_frame_time, 0, sizeof(struct retro_frame_time_callback));
-#ifdef HAVE_MENU
-   menu_driver_ctl(RARCH_MENU_CTL_UNSET_LOAD_NO_CONTENT, NULL);
-#endif
-   runloop_ctl(RUNLOOP_CTL_DATA_DEINIT, NULL);
-   runloop_ctl(RUNLOOP_CTL_TASK_INIT, NULL);
-   runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL);
-
+   runloop_ctl(RUNLOOP_CTL_STATE_FREE, NULL);
    return rarch_task_push_content_load_default(
          NULL, NULL,
          true, 
@@ -756,7 +749,6 @@ bool runloop_prepare_dummy(void)
          NULL, NULL);
 }
 
-
 bool runloop_ctl(enum runloop_ctl_state state, void *data)
 {
    settings_t *settings                             = config_get_ptr();
diff --git a/tasks/task_content.c b/tasks/task_content.c
index e45c54cce9..77fd51457a 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -1937,6 +1937,15 @@ bool rarch_task_push_content_load_default(
    switch (mode)
    {
       case CONTENT_MODE_LOAD_NOTHING_WITH_DUMMY_CORE:
+#ifdef HAVE_MENU
+         menu_driver_ctl(RARCH_MENU_CTL_UNSET_LOAD_NO_CONTENT, NULL);
+#endif
+         runloop_ctl(RUNLOOP_CTL_DATA_DEINIT, NULL);
+         runloop_ctl(RUNLOOP_CTL_TASK_INIT, NULL);
+         runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL);
+         if (!content_load_wrapper(content_info, false))
+            goto error;
+         break;
       case CONTENT_MODE_LOAD_FROM_CLI:
          if (!content_load_wrapper(content_info, false))
             goto error;