From 154e7caf17ee2a01b4bd0fbdab19d9d5e786c19b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 3 Oct 2014 11:27:19 +0200 Subject: [PATCH] menu_environment_get - only set libretro core if g_extern.has_set_libretro is false --- frontend/menu/menu_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index dbb2e7847e..99db05bdb6 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -76,7 +76,8 @@ static void menu_environment_get(int *argc, char *argv[], if (!g_extern.has_set_state_path) wrap_args->state_path = *g_extern.savestate_dir ? g_extern.savestate_dir : NULL; wrap_args->content_path = *g_extern.fullpath ? g_extern.fullpath : NULL; - wrap_args->libretro_path = *g_settings.libretro ? g_settings.libretro : NULL; + if (!g_extern.has_set_libretro) + wrap_args->libretro_path = *g_settings.libretro ? g_settings.libretro : NULL; wrap_args->touched = true; }