Merge pull request #1592 from fr500/master

do-not-merge-this-yet

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);
 }
 
 /**

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())