From b87a15c6b2dd93baa49312d64879e051333890bf Mon Sep 17 00:00:00 2001 From: zhupengfei Date: Sun, 22 Mar 2020 00:56:57 +0800 Subject: [PATCH] citra_qt: Only resume the game if it wasn't paused When dumping was stopped, the game will be paused and then resumed. However when the game was already paused this will result in the game being unexpectedly resumed, which isn't what we want. --- src/citra_qt/main.cpp | 5 ++++- src/citra_qt/main.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index e225bb5a1..55d963335 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -1850,6 +1850,8 @@ void GMainWindow::OnStopVideoDumping() { const bool was_dumping = Core::System::GetInstance().VideoDumper().IsDumping(); if (!was_dumping) return; + + game_paused_for_dumping = emu_thread->IsRunning(); OnPauseGame(); auto future = @@ -1859,7 +1861,8 @@ void GMainWindow::OnStopVideoDumping() { if (game_shutdown_delayed) { game_shutdown_delayed = false; ShutdownGame(); - } else { + } else if (game_paused_for_dumping) { + game_paused_for_dumping = false; OnStartGame(); } }); diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h index 995983e5a..132fad821 100644 --- a/src/citra_qt/main.h +++ b/src/citra_qt/main.h @@ -258,6 +258,8 @@ private: QString video_dumping_path; // Whether game shutdown is delayed due to video dumping bool game_shutdown_delayed = false; + // Whether game was paused due to stopping video dumping + bool game_paused_for_dumping = false; // Debugger panes ProfilerWidget* profilerWidget;