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

Pass runloop handle to rarch_main_data_active function -

Browse Source 
make sure mutex gets unlocked at the end in rarch_main_data_overlay_iterate
even if driver or driver->overlay is NULL
This commit is contained in:
twinaphex 2015-05-03 02:33:33 +02:00
parent 6d89a92952
commit e08fecd727
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
runloop_data.c
View File

@ -817,16 +817,16 @@ static void rarch_main_data_overlay_iterate(bool is_thread, data_runloop_t *runl
if (rarch_main_is_idle()) if (rarch_main_is_idle())
return; return;
driver = driver_get_ptr();
if (!driver || !driver->overlay)
return;
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
if (is_thread) if (is_thread)
slock_lock(runloop->overlay_lock); slock_lock(runloop->overlay_lock);
#endif #endif
driver = driver_get_ptr();
if (!driver || !driver->overlay)
goto end;
switch (driver->overlay->state) switch (driver->overlay->state)
{ {
case OVERLAY_STATUS_DEFERRED_LOAD: case OVERLAY_STATUS_DEFERRED_LOAD:
@ -848,6 +848,7 @@ static void rarch_main_data_overlay_iterate(bool is_thread, data_runloop_t *runl
break; break;
} }
end:
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
if (is_thread) if (is_thread)
slock_unlock(runloop->overlay_lock); slock_unlock(runloop->overlay_lock);
@ -925,13 +926,12 @@ static void data_runloop_iterate(bool is_thread, data_runloop_t *runloop)
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
static bool rarch_main_data_active(void) static bool rarch_main_data_active(data_runloop_t *runloop)
{ {
bool image_active, nbio_active, http_active, bool image_active, nbio_active, http_active,
http_conn_active, overlay_active, db_active; http_conn_active, overlay_active, db_active;
bool active = false; bool active = false;
data_runloop_t *runloop = (data_runloop_t*)rarch_main_data_get_ptr();
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
nbio_handle_t *nbio = runloop ? &runloop->nbio : NULL; nbio_handle_t *nbio = runloop ? &runloop->nbio : NULL;
#ifdef HAVE_RPNG #ifdef HAVE_RPNG
@ -1007,7 +1007,7 @@ static void data_thread_loop(void *data)
data_runloop_iterate(true, runloop); data_runloop_iterate(true, runloop);
if (!rarch_main_data_active()) if (!rarch_main_data_active(runloop))
rarch_sleep(10); rarch_sleep(10);
slock_unlock(runloop->lock); slock_unlock(runloop->lock);