diff options
| author | spycrab <spycrab@users.noreply.github.com> | 2018-05-17 13:22:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-17 13:22:46 +0200 |
| commit | f51eba9e79ae1cfce0b205f25e9359395ae5b465 (patch) | |
| tree | 3aa6c0f4eb4f080bf554a21ffde93a8b7e2042a1 /Source/Core/DolphinQt2/MainWindow.cpp | |
| parent | 87a29eb6029de5c297b2ddbaca7fd52cedd142c4 (diff) | |
| parent | 3d9d516bd3e6be83a4f5414c66265f7999665c37 (diff) | |
Merge pull request #6879 from aldelaro5/qt-no-screensaver-pause-play
Qt: do not toggle the screensaver when pausing or playing
Diffstat (limited to 'Source/Core/DolphinQt2/MainWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt2/MainWindow.cpp | 4 |
1 files changed, 1 insertions, 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<std::string>& 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<std::string>& 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() |
