diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index e67cb1bd6e..50906ee1fd 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -2718,8 +2718,15 @@ bool Emulator::Pause(bool freeze_emulation, bool show_resume_message) cpu.state += cpu_flag::dbg_global_pause; }; - idm::select>(on_select); - idm::select>(on_select); + if (g_fxo->is_init>>()) + { + idm::select>(on_select); + } + + if (g_fxo->is_init>>()) + { + idm::select>(on_select); + } if (auto rsx = g_fxo->try_get()) { diff --git a/rpcs3/rpcs3qt/debugger_frame.cpp b/rpcs3/rpcs3qt/debugger_frame.cpp index bdddada077..56b1ccb0a4 100644 --- a/rpcs3/rpcs3qt/debugger_frame.cpp +++ b/rpcs3/rpcs3qt/debugger_frame.cpp @@ -1049,8 +1049,15 @@ void debugger_frame::UpdateUnitList() if (emu_state != system_state::stopped) { - idm::select>(on_select, idm::unlocked); - idm::select>(on_select, idm::unlocked); + if (g_fxo->is_init>>()) + { + idm::select>(on_select, idm::unlocked); + } + + if (g_fxo->is_init>>()) + { + idm::select>(on_select, idm::unlocked); + } if (const auto render = g_fxo->try_get(); render && render->ctrl) {