From 2c21a886774b7075797ed7e7bf34bb3724be55b5 Mon Sep 17 00:00:00 2001 From: radius Date: Fri, 10 Apr 2015 00:55:41 -0500 Subject: [PATCH] Restore libretro_path after loading an override, otherwise content_history might glitch --- configuration.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configuration.c b/configuration.c index 77910c8e8a..be0789a24a 100644 --- a/configuration.c +++ b/configuration.c @@ -1743,8 +1743,13 @@ bool config_load_override(void) // Re-load the configuration with any overrides that might have been found if (should_append) { + char buf[PATH_MAX_LENGTH]; + //Store the libretro_path we're using since it will be overwritten by the override when reloading + strlcpy(buf,settings->libretro,sizeof(buf)); if (config_load_file(global->config_path, false)) - { + { + //Restore the libretro_path we're using since it will be overwritten by the override when reloading + strlcpy(settings->libretro,buf,sizeof(settings->libretro)); rarch_main_msg_queue_push("Configuration override loaded", 1, 100, true); return true; }