mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-23 10:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1686 from heuripedes/master

Browse Source 
(driver.c) Deinitialize in the reverse order of initialization
This commit is contained in:
Twinaphex 2015-05-10 23:55:24 +02:00
commit fcd784de94
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
driver.c
View File

@ -443,18 +443,6 @@ void uninit_drivers(int flags)
{ {
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
if (flags & DRIVER_AUDIO)
uninit_audio();
if (flags & DRIVER_VIDEO)
{
global_t *global = global_get_ptr();
if (global->system.hw_render_callback.context_destroy &&
!driver->video_cache_context)
global->system.hw_render_callback.context_destroy();
}
#ifdef HAVE_MENU #ifdef HAVE_MENU
if (flags & DRIVER_MENU) if (flags & DRIVER_MENU)
{ {
@ -469,11 +457,11 @@ void uninit_drivers(int flags)
} }
#endif #endif
if (flags & DRIVERS_VIDEO_INPUT) if ((flags & DRIVER_LOCATION) && !driver->location_data_own)
uninit_video_input(); {
uninit_location();
if ((flags & DRIVER_VIDEO) && !driver->video_data_own) driver->location_data = NULL;
driver->video_data = NULL; }
if ((flags & DRIVER_CAMERA) && !driver->camera_data_own) if ((flags & DRIVER_CAMERA) && !driver->camera_data_own)
{ {
@ -481,12 +469,24 @@ void uninit_drivers(int flags)
driver->camera_data = NULL; driver->camera_data = NULL;
} }
if ((flags & DRIVER_LOCATION) && !driver->location_data_own) if (flags & DRIVER_AUDIO)
uninit_audio();
if (flags & DRIVERS_VIDEO_INPUT)
uninit_video_input();
if (flags & DRIVER_VIDEO)
{ {
uninit_location(); global_t *global = global_get_ptr();
driver->location_data = NULL;
if (global->system.hw_render_callback.context_destroy &&
!driver->video_cache_context)
global->system.hw_render_callback.context_destroy();
} }
if ((flags & DRIVER_VIDEO) && !driver->video_data_own)
driver->video_data = NULL;
if ((flags & DRIVER_INPUT) && !driver->input_data_own) if ((flags & DRIVER_INPUT) && !driver->input_data_own)
driver->input_data = NULL; driver->input_data = NULL;