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

Core: Replace recursive locking from PauseAndLock 

PauseAndLock cannot be called recursively anymore.
This commit is contained in:
Léo Lam 2017-07-21 16:04:02 +08:00
parent f106a9637d
commit 5729ac0fc6
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/Core.cpp
View File

@ -102,7 +102,6 @@ static StoppedCallbackFunc s_on_stopped_callback;
static std::thread s_cpu_thread; static std::thread s_cpu_thread;
static bool s_request_refresh_info = false; static bool s_request_refresh_info = false;
static int s_pause_and_lock_depth = 0;
static bool s_is_throttler_temp_disabled = false; static bool s_is_throttler_temp_disabled = false;
struct HostJob struct HostJob
@ -765,11 +764,6 @@ static bool PauseAndLock(bool do_lock, bool unpause_on_unlock)
if (!IsRunning()) if (!IsRunning())
return true; return true;
// let's support recursive locking to simplify things on the caller's side,
// and let's do it at this outer level in case the individual systems don't support it.
if (do_lock ? s_pause_and_lock_depth++ : --s_pause_and_lock_depth)
return true;
bool was_unpaused = true; bool was_unpaused = true;
if (do_lock) if (do_lock)
{ {