ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(PS3) 'Return to Multiman' option fixed

This commit is contained in:
Twinaphex 2012-08-18 18:25:38 +02:00
parent c8b3046c6e
commit 0e86504097
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
console/rarch_console_settings.c
View File

@ -106,6 +106,7 @@ void rarch_settings_change(unsigned setting)
case S_RETURN_TO_LAUNCHER: case S_RETURN_TO_LAUNCHER:
g_console.return_to_launcher = true; g_console.return_to_launcher = true;
g_console.menu_enable = false; g_console.menu_enable = false;
g_console.initialize_rarch_enable = false;
g_console.mode_switch = MODE_EXIT; g_console.mode_switch = MODE_EXIT;
break; break;
case S_RETURN_TO_MENU: case S_RETURN_TO_MENU:

11
console/rmenu/rmenu.c
View File

@ -2210,13 +2210,10 @@ static void ingame_menu(item *items, menu *current_menu, uint64_t input)
case MENU_ITEM_RETURN_TO_MULTIMAN: case MENU_ITEM_RETURN_TO_MULTIMAN:
if(input & (1 << RETRO_DEVICE_ID_JOYPAD_B)) if(input & (1 << RETRO_DEVICE_ID_JOYPAD_B))
{ {
if(path_file_exists(default_paths.multiman_self_file)) RARCH_LOG("Boot Multiman: %s.\n", default_paths.multiman_self_file);
{ strlcpy(g_console.launch_app_on_exit, default_paths.multiman_self_file,
strlcpy(g_console.launch_app_on_exit, default_paths.multiman_self_file, sizeof(g_console.launch_app_on_exit));
sizeof(g_console.launch_app_on_exit)); rarch_settings_change(S_RETURN_TO_LAUNCHER);
rarch_settings_change(S_RETURN_TO_DASHBOARD);
}
} }
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)); 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; break;

14
ps3/frontend/main.c
View File

@ -123,17 +123,9 @@ static void get_environment_settings(int argc, char *argv[])
#endif #endif
#ifdef HAVE_MULTIMAN #ifdef HAVE_MULTIMAN
if(argc > 1) /* not launched from external launcher, set default path */
{ strlcpy(default_paths.multiman_self_file, "/dev_hdd0/game/BLES80608/USRDIR/RELOAD.SELF",
/* launched from external launcher */ sizeof(default_paths.multiman_self_file));
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));
}
if(path_file_exists(default_paths.multiman_self_file) && argc > 1 && path_file_exists(argv[1])) if(path_file_exists(default_paths.multiman_self_file) && argc > 1 && path_file_exists(argv[1]))
{ {