From 599d09c7ced2d841cfbb688a8fd0dd96a0376c6f Mon Sep 17 00:00:00 2001 From: radius Date: Mon, 6 Apr 2015 00:01:33 -0500 Subject: [PATCH] move pretro_set_environment(rarch_environment_cb); after init_libretro_sym so core_options and libretro_path can be overriden --- dynamic.c | 3 ++- retroarch.c | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dynamic.c b/dynamic.c index 29a188cc96..db4f0b746f 100644 --- a/dynamic.c +++ b/dynamic.c @@ -455,7 +455,8 @@ void init_libretro_sym(bool dummy) load_symbols(dummy); - pretro_set_environment(rarch_environment_cb); + //move this to init_core, will need to be tested + //pretro_set_environment(rarch_environment_cb); } /** diff --git a/retroarch.c b/retroarch.c index dc804d560e..96949622f5 100644 --- a/retroarch.c +++ b/retroarch.c @@ -1886,6 +1886,9 @@ static bool init_core(void) driver_t *driver = driver_get_ptr(); global_t *global = global_get_ptr(); + //needs testing for regressions + pretro_set_environment(rarch_environment_cb); + if (!config_load_override()) RARCH_ERR("Error loading override files\n"); if (!config_load_remap())