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

Fix environment callback regression

Browse Source
This commit is contained in:
Higor Eurípedes 2014-09-21 09:33:51 -03:00
parent 430e0f1911
commit aa5810ba15
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dynamic.c
View File

@ -102,6 +102,7 @@ size_t (*pretro_get_memory_size)(unsigned);
#endif #endif
static bool *load_no_content_hook; static bool *load_no_content_hook;
static bool ignore_environment_cb;
static bool environ_cb_get_system_info(unsigned cmd, void *data) static bool environ_cb_get_system_info(unsigned cmd, void *data)
{ {
@ -125,6 +126,13 @@ void libretro_get_environment_info(void (*func)(retro_environment_t),
/* load_no_content gets set in this callback. */ /* load_no_content gets set in this callback. */
func(environ_cb_get_system_info); func(environ_cb_get_system_info);
/* It's possible that we just set get_system_info callback to the currently running core.
* Make sure we reset it to the actual environment callback.
* Ignore any environment callbacks here in case we're running on the non-current core. */
ignore_environment_cb = true;
func(rarch_environment_cb);
ignore_environment_cb = false;
} }
static dylib_t libretro_get_system_info_lib(const char *path, static dylib_t libretro_get_system_info_lib(const char *path,
@ -499,6 +507,9 @@ bool rarch_environment_cb(unsigned cmd, void *data)
{ {
unsigned p, id; unsigned p, id;
if (ignore_environment_cb)
return false;
switch (cmd) switch (cmd)
{ {
case RETRO_ENVIRONMENT_GET_OVERSCAN: case RETRO_ENVIRONMENT_GET_OVERSCAN: