From 1a6e2856857c6bc03c162113e9f58cf0ba34caec Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Sun, 4 Jun 2023 13:00:33 -0700 Subject: [PATCH] CPU: Remove default arguments for PauseAndLock For clarity in the next commit. --- Source/Core/Core/Core.cpp | 2 +- Source/Core/Core/HW/CPU.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index daea8fd77e..6a949f147c 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -781,7 +781,7 @@ static bool PauseAndLock(Core::System& system, bool do_lock, bool unpause_on_unl // first pause the CPU // This acquires a wrapper mutex and converts the current thread into // a temporary replacement CPU Thread. - was_unpaused = system.GetCPU().PauseAndLock(true); + was_unpaused = system.GetCPU().PauseAndLock(true, true, false); } // audio has to come after CPU, because CPU thread can wait for audio thread (m_throttle). diff --git a/Source/Core/Core/HW/CPU.h b/Source/Core/Core/HW/CPU.h index 615b9ff388..104a83204a 100644 --- a/Source/Core/Core/HW/CPU.h +++ b/Source/Core/Core/HW/CPU.h @@ -95,7 +95,7 @@ public: // Cannot be used by System threads as it will deadlock. It is threadsafe otherwise. // "control_adjacent" causes PauseAndLock to behave like SetStepping by modifying the // state of the Audio and FIFO subsystems as well. - bool PauseAndLock(bool do_lock, bool unpause_on_unlock = true, bool control_adjacent = false); + bool PauseAndLock(bool do_lock, bool unpause_on_unlock, bool control_adjacent); void RestoreStateAndUnlock(bool unpause_on_unlock, bool control_adjacent); // Adds a job to be executed during on the CPU thread. This should be combined with