From ce412a7c8bee18e2741c6c17b2dfc127a0dd11bf Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 5 Jun 2014 06:45:31 +0200 Subject: [PATCH] (XDK/GX) Cleanups to exitspawn implementations --- frontend/platform/platform_gx.c | 4 +++- frontend/platform/platform_xdk.c | 7 ++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/frontend/platform/platform_gx.c b/frontend/platform/platform_gx.c index f7b6755061..ff40c942a9 100644 --- a/frontend/platform/platform_gx.c +++ b/frontend/platform/platform_gx.c @@ -291,7 +291,9 @@ static void frontend_gx_exitspawn(char *core_path, size_t sizeof_core_path) if (g_extern.lifecycle_state & (1ULL << MODE_EXITSPAWN_START_GAME)) should_load_game = true; - frontend_gx_exec(g_settings.libretro, should_load_game); + frontend_gx_exec(core_path, should_load_game); + + // FIXME/TODO - hack // direct loading failed (out of memory), try to jump to salamander then load the correct core fill_pathname_join(core_path, default_paths.core_dir, "boot.dol", sizeof_core_path); #endif diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c index 4cda5cc3ec..330476ec1f 100644 --- a/frontend/platform/platform_xdk.c +++ b/frontend/platform/platform_xdk.c @@ -244,15 +244,12 @@ static void frontend_xdk_exec(const char *path, bool should_load_game); static void frontend_xdk_exitspawn(char *core_path, size_t sizeof_core_path) { -#ifdef IS_SALAMANDER - frontend_xdk_exec(core_path, false); -#else bool should_load_game = false; +#ifndef IS_SALAMANDER if (g_extern.lifecycle_state & (1ULL << MODE_EXITSPAWN_START_GAME)) should_load_game = true; - - frontend_xdk_exec(g_settings.libretro, should_load_game); #endif + frontend_xdk_exec(core_path, should_load_game); } #include