ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2019-07-20 12:34:49 +02:00
parent 430fc16f61
commit 16dde76a68
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
retroarch.c
View File

@ -3409,7 +3409,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
rarch_ctl(RARCH_CTL_CONTENT_RUNTIME_LOG_DEINIT, NULL); rarch_ctl(RARCH_CTL_CONTENT_RUNTIME_LOG_DEINIT, NULL);
rarch_ctl(RARCH_CTL_SET_SHUTDOWN, NULL); rarch_ctl(RARCH_CTL_SET_SHUTDOWN, NULL);
rarch_ctl(RARCH_CTL_SET_CORE_SHUTDOWN, NULL); runloop_core_shutdown_initiated = true;
break; break;
case RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL: case RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL:
@ -19182,15 +19182,9 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
task_queue_init(threaded_enable, runloop_task_msg_queue_push); task_queue_init(threaded_enable, runloop_task_msg_queue_push);
} }
break; break;
case RARCH_CTL_SET_CORE_SHUTDOWN:
runloop_core_shutdown_initiated = true;
break;
case RARCH_CTL_SET_SHUTDOWN: case RARCH_CTL_SET_SHUTDOWN:
runloop_shutdown_initiated = true; runloop_shutdown_initiated = true;
break; break;
case RARCH_CTL_UNSET_SHUTDOWN:
runloop_shutdown_initiated = false;
break;
case RARCH_CTL_IS_SHUTDOWN: case RARCH_CTL_IS_SHUTDOWN:
return runloop_shutdown_initiated; return runloop_shutdown_initiated;
case RARCH_CTL_DATA_DEINIT: case RARCH_CTL_DATA_DEINIT:
@ -20146,7 +20140,7 @@ static enum runloop_state runloop_check_state(
{ {
/* Loads dummy core instead of exiting RetroArch completely. /* Loads dummy core instead of exiting RetroArch completely.
* Aborts core shutdown if invoked. */ * Aborts core shutdown if invoked. */
rarch_ctl(RARCH_CTL_UNSET_SHUTDOWN, NULL); runloop_shutdown_initiated = false;
runloop_core_shutdown_initiated = false; runloop_core_shutdown_initiated = false;
} }
else else

3
retroarch.h
View File

@ -144,10 +144,7 @@ enum rarch_ctl_state
RARCH_CTL_IS_PAUSED, RARCH_CTL_IS_PAUSED,
RARCH_CTL_SET_PAUSED, RARCH_CTL_SET_PAUSED,
RARCH_CTL_SET_CORE_SHUTDOWN,
RARCH_CTL_SET_SHUTDOWN, RARCH_CTL_SET_SHUTDOWN,
RARCH_CTL_UNSET_SHUTDOWN,
RARCH_CTL_IS_SHUTDOWN, RARCH_CTL_IS_SHUTDOWN,
/* Runloop state */ /* Runloop state */