From 0e86504097ec363ab69b39e36f95abab88bfcb86 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sat, 18 Aug 2012 18:25:38 +0200 Subject: [PATCH] (PS3) 'Return to Multiman' option fixed --- console/rarch_console_settings.c | 1 + console/rmenu/rmenu.c | 11 ++++------- ps3/frontend/main.c | 14 +++----------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/console/rarch_console_settings.c b/console/rarch_console_settings.c index 5d77ad8947..7c5829d0f8 100644 --- a/console/rarch_console_settings.c +++ b/console/rarch_console_settings.c @@ -106,6 +106,7 @@ void rarch_settings_change(unsigned setting) case S_RETURN_TO_LAUNCHER: g_console.return_to_launcher = true; g_console.menu_enable = false; + g_console.initialize_rarch_enable = false; g_console.mode_switch = MODE_EXIT; break; case S_RETURN_TO_MENU: diff --git a/console/rmenu/rmenu.c b/console/rmenu/rmenu.c index a380f73033..29dd42e5e7 100644 --- a/console/rmenu/rmenu.c +++ b/console/rmenu/rmenu.c @@ -2210,13 +2210,10 @@ static void ingame_menu(item *items, menu *current_menu, uint64_t input) case MENU_ITEM_RETURN_TO_MULTIMAN: if(input & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { - if(path_file_exists(default_paths.multiman_self_file)) - { - strlcpy(g_console.launch_app_on_exit, default_paths.multiman_self_file, - sizeof(g_console.launch_app_on_exit)); - - rarch_settings_change(S_RETURN_TO_DASHBOARD); - } + RARCH_LOG("Boot Multiman: %s.\n", default_paths.multiman_self_file); + strlcpy(g_console.launch_app_on_exit, default_paths.multiman_self_file, + sizeof(g_console.launch_app_on_exit)); + rarch_settings_change(S_RETURN_TO_LAUNCHER); } snprintf(comment, sizeof(comment), "Press [%s] to quit RetroArch and return to multiMAN.", rarch_input_find_platform_key_label(1 << RETRO_DEVICE_ID_JOYPAD_B)); break; diff --git a/ps3/frontend/main.c b/ps3/frontend/main.c index 8e3959379b..74161143b9 100644 --- a/ps3/frontend/main.c +++ b/ps3/frontend/main.c @@ -123,17 +123,9 @@ static void get_environment_settings(int argc, char *argv[]) #endif #ifdef HAVE_MULTIMAN - if(argc > 1) - { - /* launched from external launcher */ - strlcpy(default_paths.multiman_self_file, argv[2], sizeof(default_paths.multiman_self_file)); - } - else - { - /* not launched from external launcher, set default path */ - strlcpy(default_paths.multiman_self_file, "/dev_hdd0/game/BLES80608/USRDIR/RELOAD.SELF", - sizeof(default_paths.multiman_self_file)); - } + /* not launched from external launcher, set default path */ + strlcpy(default_paths.multiman_self_file, "/dev_hdd0/game/BLES80608/USRDIR/RELOAD.SELF", + sizeof(default_paths.multiman_self_file)); if(path_file_exists(default_paths.multiman_self_file) && argc > 1 && path_file_exists(argv[1])) {