CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-21 18:28:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes crash on Close Content on Android.

Browse Source 
Bizarre usage of -L argument caused it along with --menu
This commit is contained in:
twinaphex 2016-04-05 23:21:55 +02:00
parent 20706b51de
commit 43860e384a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
retroarch.c
View File

@ -1020,10 +1020,19 @@ static void parse_input(int argc, char *argv[])
}
}
if (explicit_menu && current_core_type != CORE_TYPE_DUMMY)
if (explicit_menu)
{
RARCH_ERR("--menu was used, but content file or libretro core was passed as well.\n");
retro_fail(1, "parse_input()");
if (optind < argc)
{
RARCH_ERR("--menu was used, but content file was passed as well.\n");
retro_fail(1, "parse_input()");
}
else
{
/* Allow stray -L arguments to go through to workaround cases where it's used as "config file".
* This seems to still be the case for Android, which should be properly fixed. */
current_core_type = CORE_TYPE_DUMMY;
}
}
if (!*global->subsystem && optind < argc)