libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-25 00:49:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge pull request #1776 from heuripedes/master

Browse Source 
Revert "(retroarch.c) Default to --menu behavior"
This commit is contained in:
Twinaphex 2015-06-12 20:22:23 +02:00
commit d78ed579e9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
retroarch.c
View File

@ -399,11 +399,7 @@ static void parse_input(int argc, char *argv[])
global_t *global = global_get_ptr();
global->libretro_no_content = false;
#ifdef HAVE_DYNAMIC
global->libretro_dummy = true;
#else
global->libretro_dummy = false;
#endif
global->has_set_save_path = false;
global->has_set_state_path = false;
global->has_set_libretro = false;
@ -430,6 +426,12 @@ static void parse_input(int argc, char *argv[])
global->overrides_active = false;
if (argc < 2)
{
global->libretro_dummy = true;
return;
}
/* Make sure we can call parse_input several times ... */
optind = 0;
@ -620,7 +622,6 @@ static void parse_input(int argc, char *argv[])
sizeof(settings->libretro));
global->has_set_libretro = true;
}
global->libretro_dummy = false;
break;
#endif
case 'P':