diff --git a/rpcs3/Emu/Cell/lv2/sys_config.h b/rpcs3/Emu/Cell/lv2/sys_config.h index d1a138f1b7..36a2b3993d 100644 --- a/rpcs3/Emu/Cell/lv2/sys_config.h +++ b/rpcs3/Emu/Cell/lv2/sys_config.h @@ -396,9 +396,9 @@ public: // Destructor ~lv2_config_service_event() { - if (auto& global = g_fxo->get(); !Emu.IsStopped()) + if (auto global = g_fxo->try_get()) { - global.remove_service_event(id); + global->remove_service_event(id); } } diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index 755af8403f..4353e19720 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -3121,7 +3121,7 @@ namespace rsx while (!external_interrupt_ack) { - if (Emu.IsStopped()) + if (is_stopped()) break; utils::pause(); diff --git a/rpcs3/Emu/RSX/RSXZCULL.cpp b/rpcs3/Emu/RSX/RSXZCULL.cpp index 12d4a61871..a0ef29bbba 100644 --- a/rpcs3/Emu/RSX/RSXZCULL.cpp +++ b/rpcs3/Emu/RSX/RSXZCULL.cpp @@ -691,7 +691,7 @@ namespace rsx } // There can be multiple queries all writing to the same address, loop to flush all of them - while (query->pending && !Emu.IsStopped()) + while (query->pending) { update(ptimer, sync_address); } @@ -704,7 +704,7 @@ namespace rsx flags32_t ZCULL_control::read_barrier(class ::rsx::thread* ptimer, u32 memory_address, occlusion_query_info* query) { // Called by cond render control. Internal RSX usage, do not disable optimizations - while (query->pending && !Emu.IsStopped()) + while (query->pending) { update(ptimer, memory_address); }