mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-08 06:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1592 from fr500/master

Browse Source 
do-not-merge-this-yet
This commit is contained in:
Twinaphex 2015-04-06 21:19:31 +02:00
commit 3aada5d167
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dynamic.c
View File

@ -455,7 +455,8 @@ void init_libretro_sym(bool dummy)
load_symbols(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);
} }
/** /**

3
retroarch.c
View File

@ -1886,6 +1886,9 @@ static bool init_core(void)
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
//needs testing for regressions
pretro_set_environment(rarch_environment_cb);
if (!config_load_override()) if (!config_load_override())
RARCH_ERR("Error loading override files\n"); RARCH_ERR("Error loading override files\n");
if (!config_load_remap()) if (!config_load_remap())