diff options
| author |  bunnei | 2020-03-26 16:42:57 -0400 |
|---|---|---|
| committer |  GitHub | 2020-03-26 16:42:57 -0400 |
| commit | 950b6dbc800f3ab757433de0a989d2550e13d32b (patch) | |
| tree | d9a8f1e894d834cab7ebc31a9bb6851844e89d21 /src | |
| parent | Merge pull request #3550 from hughesjs/hughesjs-readme-changes-1 (diff) | |
| parent | yuzu: Remove exit lock for game pausing (diff) | |
| download | yuzu-950b6dbc800f3ab757433de0a989d2550e13d32b.tar.gz yuzu-950b6dbc800f3ab757433de0a989d2550e13d32b.tar.xz yuzu-950b6dbc800f3ab757433de0a989d2550e13d32b.zip | |
Merge pull request #3453 from FearlessTobi/remove-pause-lock
yuzu: Remove exit lock for game pausing
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/main.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 47615adfe..4769a612e 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -1716,11 +1716,6 @@ void GMainWindow::OnStartGame() { | |||
| 1716 | } | 1716 | } |
| 1717 | 1717 | ||
| 1718 | void GMainWindow::OnPauseGame() { | 1718 | void GMainWindow::OnPauseGame() { |
| 1719 | Core::System& system{Core::System::GetInstance()}; | ||
| 1720 | if (system.GetExitLock() && !ConfirmForceLockedExit()) { | ||
| 1721 | return; | ||
| 1722 | } | ||
| 1723 | |||
| 1724 | emu_thread->SetRunning(false); | 1719 | emu_thread->SetRunning(false); |
| 1725 | 1720 | ||
| 1726 | ui.action_Start->setEnabled(true); | 1721 | ui.action_Start->setEnabled(true); |