ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6879 from aldelaro5/qt-no-screensaver-pause-play 

Qt: do not toggle the screensaver when pausing or playing
This commit is contained in:
spycrab 2018-05-17 13:22:46 +02:00 committed by GitHub
parent 87a29eb602 3d9d516bd3
commit f51eba9e79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinQt2/MainWindow.cpp
View File

@ -513,7 +513,6 @@ void MainWindow::Play(const std::optional<std::string>& savestate_path)
if (Core::GetState() == Core::State::Paused) if (Core::GetState() == Core::State::Paused)
{ {
Core::SetState(Core::State::Running); Core::SetState(Core::State::Running);
EnableScreenSaver(false);
} }
else else
{ {
@ -542,7 +541,6 @@ void MainWindow::Play(const std::optional<std::string>& savestate_path)
void MainWindow::Pause() void MainWindow::Pause()
{ {
Core::SetState(Core::State::Paused); Core::SetState(Core::State::Paused);
EnableScreenSaver(true);
} }
void MainWindow::TogglePause() void MainWindow::TogglePause()
@ -561,6 +559,7 @@ void MainWindow::OnStopComplete()
{ {
m_stop_requested = false; m_stop_requested = false;
HideRenderWidget(); HideRenderWidget();
EnableScreenSaver(true);
SetFullScreenResolution(false); SetFullScreenResolution(false);
@ -639,7 +638,6 @@ bool MainWindow::RequestStop()
void MainWindow::ForceStop() void MainWindow::ForceStop()
{ {
Core::Stop(); Core::Stop();
EnableScreenSaver(true);
} }
void MainWindow::Reset() void MainWindow::Reset()