From 6ff9aab2ca5f3f6035db9471bb2f0a1eb7aa0972 Mon Sep 17 00:00:00 2001 From: Eladash Date: Fri, 28 May 2021 11:56:06 +0300 Subject: [PATCH] Fix cpu_thread::check_state() cpu_flag::temp support --- rpcs3/Emu/CPU/CPUThread.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp index 531bb45b1c..2a4e8376bf 100644 --- a/rpcs3/Emu/CPU/CPUThread.cpp +++ b/rpcs3/Emu/CPU/CPUThread.cpp @@ -693,8 +693,8 @@ bool cpu_thread::check_state() noexcept // Atomically clean wait flag and escape if (!(flags & (cpu_flag::exit + cpu_flag::ret + cpu_flag::stop))) { - // Check pause flags which hold thread inside check_state (ignore suspend on cpu_flag::temp) - if (flags & (cpu_flag::pause + cpu_flag::dbg_global_pause + cpu_flag::dbg_pause + cpu_flag::memory + (cpu_can_stop ? cpu_flag::suspend : cpu_flag::pause))) + // Check pause flags which hold thread inside check_state (ignore suspend/debug flags on cpu_flag::temp) + if (flags & (cpu_flag::pause + cpu_flag::memory) || (cpu_can_stop && flags & (cpu_flag::dbg_global_pause + cpu_flag::dbg_pause + cpu_flag::suspend))) { if (!(flags & cpu_flag::wait)) {