From 3d9d516bd3e6be83a4f5414c66265f7999665c37 Mon Sep 17 00:00:00 2001 From: aldelaro5 Date: Wed, 16 May 2018 23:16:01 -0400 Subject: [PATCH] Qt: do not toggle the screensaver when pausing or playing This fixes 2 crashes with the pause function. One is when spamming the pause hotkey and the other is to press pause and step hotkeys at the same time. It does disable the screensaver getting disabled when the emulator is running, but paused, though, a better solution would have to be done without introducing these crashes. --- Source/Core/DolphinQt2/MainWindow.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp index d3e4a75bab..50bc8ff032 100644 --- a/Source/Core/DolphinQt2/MainWindow.cpp +++ b/Source/Core/DolphinQt2/MainWindow.cpp @@ -513,7 +513,6 @@ void MainWindow::Play(const std::optional& savestate_path) if (Core::GetState() == Core::State::Paused) { Core::SetState(Core::State::Running); - EnableScreenSaver(false); } else { @@ -542,7 +541,6 @@ void MainWindow::Play(const std::optional& savestate_path) void MainWindow::Pause() { Core::SetState(Core::State::Paused); - EnableScreenSaver(true); } void MainWindow::TogglePause() @@ -561,6 +559,7 @@ void MainWindow::OnStopComplete() { m_stop_requested = false; HideRenderWidget(); + EnableScreenSaver(true); SetFullScreenResolution(false); @@ -639,7 +638,6 @@ bool MainWindow::RequestStop() void MainWindow::ForceStop() { Core::Stop(); - EnableScreenSaver(true); } void MainWindow::Reset()