From 258cc97d144e5adc8b0cc7f1fbfa20ae7d9b93b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= Date: Fri, 12 Jun 2015 15:20:48 -0300 Subject: [PATCH] Revert "(retroarch.c) Default to --menu behavior" This reverts commit 34af0aa9563e3236140bf161c3dc81d521c5de45. --- retroarch.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/retroarch.c b/retroarch.c index a98f89524f..a01ed3f88a 100644 --- a/retroarch.c +++ b/retroarch.c @@ -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':