1
0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 18:40:09 +00:00

Merge pull request from heuripedes/master

Revert "(retroarch.c) Default to --menu behavior"
This commit is contained in:
Twinaphex 2015-06-12 20:22:23 +02:00
commit d78ed579e9

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