From 57324f1703f6d2733dddf943c6ed2185a386d050 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sat, 25 Nov 2023 11:46:55 +0100 Subject: [PATCH] Qt: notify progress dialog cancelation when closing the game window --- rpcs3/rpcs3qt/gs_frame.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp index 498e4ac3f5..29d9cfd37d 100644 --- a/rpcs3/rpcs3qt/gs_frame.cpp +++ b/rpcs3/rpcs3qt/gs_frame.cpp @@ -614,6 +614,9 @@ void gs_frame::close() if (!Emu.IsStopped()) { + // Notify progress dialog cancellation + g_system_progress_canceled = true; + // Blocking shutdown request. Obsolete, but I'm keeping it here as last resort. Emu.after_kill_callback = [this](){ deleteLater(); }; Emu.GracefulShutdown(true); @@ -1112,6 +1115,9 @@ bool gs_frame::event(QEvent* ev) } else { + // Notify progress dialog cancellation + g_system_progress_canceled = true; + // Issue async shutdown Emu.GracefulShutdown(true, true);