Merge pull request #1904 from heuripedes/master

Fix #1899
This commit is contained in:
Twinaphex 2015-07-05 21:55:14 +02:00
commit 792ee4459c
2 changed files with 29 additions and 1 deletions

View File

@ -554,7 +554,6 @@ static void event_deinit_core(bool reinit)
global->overrides_active = false;
}
pretro_set_environment(rarch_environment_cb);
uninit_libretro_sym();
}
@ -733,6 +732,9 @@ static bool event_init_core(void)
global->overrides_active = false;
}
/* reset video format to libretro's default */
video_driver_set_pixel_format(RETRO_PIXEL_FORMAT_0RGB1555);
pretro_set_environment(rarch_environment_cb);
/* auto-remap: apply remap files */

View File

@ -564,6 +564,32 @@ void uninit_libretro_sym(void)
lib_handle = NULL;
#endif
pretro_init = NULL;
pretro_deinit = NULL;
pretro_api_version = NULL;
pretro_get_system_info = NULL;
pretro_get_system_av_info = NULL;
pretro_set_environment = NULL;
pretro_set_video_refresh = NULL;
pretro_set_audio_sample = NULL;
pretro_set_audio_sample_batch = NULL;
pretro_set_input_poll = NULL;
pretro_set_input_state = NULL;
pretro_set_controller_port_device = NULL;
pretro_reset = NULL;
pretro_run = NULL;
pretro_serialize_size = NULL;
pretro_serialize = NULL;
pretro_unserialize = NULL;
pretro_cheat_reset = NULL;
pretro_cheat_set = NULL;
pretro_load_game = NULL;
pretro_load_game_special = NULL;
pretro_unload_game = NULL;
pretro_get_region = NULL;
pretro_get_memory_data = NULL;
pretro_get_memory_size = NULL;
rarch_system_info_free();
driver->camera_active = false;