diff options
| author |  Adam Heinermann | 2021-12-04 23:06:56 -0800 |
|---|---|---|
| committer | Adam Heinermann | 2021-12-04 23:22:39 -0800 |
| commit | 722005697415463d1708b896d903b592086f134e (patch) | |
| tree | 6f1260f81d552e7a7c58cff78de6ebf7bfa888c6 /src | |
| parent | Merge pull request #7467 from liushuyu/fix-linux-decoding (diff) | |
| download | yuzu-722005697415463d1708b896d903b592086f134e.tar.gz yuzu-722005697415463d1708b896d903b592086f134e.tar.xz yuzu-722005697415463d1708b896d903b592086f134e.zip | |
Fixed #7502
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/main.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index f266fd963..77f2375ea 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -1082,14 +1082,15 @@ void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) { | |||
| 1082 | state != Qt::ApplicationActive) { | 1082 | state != Qt::ApplicationActive) { |
| 1083 | LOG_DEBUG(Frontend, "ApplicationState unusual flag: {} ", state); | 1083 | LOG_DEBUG(Frontend, "ApplicationState unusual flag: {} ", state); |
| 1084 | } | 1084 | } |
| 1085 | if (ui->action_Pause->isEnabled() && | 1085 | if (emulation_running) { |
| 1086 | (state & (Qt::ApplicationHidden | Qt::ApplicationInactive))) { | 1086 | if (emu_thread->IsRunning() && |
| 1087 | auto_paused = true; | 1087 | (state & (Qt::ApplicationHidden | Qt::ApplicationInactive))) { |
| 1088 | OnPauseGame(); | 1088 | auto_paused = true; |
| 1089 | } else if (emulation_running && !emu_thread->IsRunning() && auto_paused && | 1089 | OnPauseGame(); |
| 1090 | state == Qt::ApplicationActive) { | 1090 | } else if (!emu_thread->IsRunning() && auto_paused && state == Qt::ApplicationActive) { |
| 1091 | auto_paused = false; | 1091 | auto_paused = false; |
| 1092 | OnStartGame(); | 1092 | OnStartGame(); |
| 1093 | } | ||
| 1093 | } | 1094 | } |
| 1094 | } | 1095 | } |
| 1095 | 1096 | ||