summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/Core.cpp2
-rw-r--r--Source/Core/Core/HW/CPU.cpp4
-rw-r--r--Source/Core/Core/HW/CPU.h2
3 files changed, 3 insertions, 5 deletions
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
index 2b005374ad..b8f5891f3d 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(false);
+ was_unpaused = system.GetCPU().PauseAndLock();
}
// audio has to come after CPU, because CPU thread can wait for audio thread (m_throttle).
diff --git a/Source/Core/Core/HW/CPU.cpp b/Source/Core/Core/HW/CPU.cpp
index 9942478cb2..6f1a3c7285 100644
--- a/Source/Core/Core/HW/CPU.cpp
+++ b/Source/Core/Core/HW/CPU.cpp
@@ -351,7 +351,7 @@ void CPUManager::Continue()
Core::NotifyStateChanged(Core::State::Running);
}
-bool CPUManager::PauseAndLock(const bool control_adjacent)
+bool CPUManager::PauseAndLock()
{
m_stepping_lock.lock();
@@ -366,8 +366,6 @@ bool CPUManager::PauseAndLock(const bool control_adjacent)
m_state_cpu_idle_cvar.wait(state_lock);
}
- if (control_adjacent)
- RunAdjacentSystems(false);
state_lock.unlock();
// NOTE: It would make more sense for Core::DeclareAsCPUThread() to keep a
diff --git a/Source/Core/Core/HW/CPU.h b/Source/Core/Core/HW/CPU.h
index b6eea7f052..40cb25ca6e 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 control_adjacent);
+ bool PauseAndLock();
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