summaryrefslogtreecommitdiff
path: root/src/yuzu/main.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-03-28 00:28:31 -0400
committerGitHub <noreply@github.com>2020-03-28 00:28:31 -0400
commit9bd998037265d97179962fb9d2e500a05caad3dc (patch)
tree68c39d50412683dd50e03e4e93937f0e7cea2c51 /src/yuzu/main.cpp
parent6286b8dedd7f79494bdfc28ff5ab059ab310cfb4 (diff)
parent8ba06aa4e1da6dc7b4fa761dba28165d8a634f84 (diff)
Merge pull request #3576 from FearlessTobi/port-4906
Port citra-emu/citra#4906: "citra_qt: fix the stuck in fullscreen mode"
Diffstat (limited to 'src/yuzu/main.cpp')
-rw-r--r--src/yuzu/main.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 4769a612e..415a64b1e 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1034,6 +1034,14 @@ void GMainWindow::BootGame(const QString& filename) {
}
void GMainWindow::ShutdownGame() {
+ if (!emulation_running) {
+ return;
+ }
+
+ if (ui.action_Fullscreen->isChecked()) {
+ HideFullscreen();
+ }
+
AllowOSSleep();
discord_rpc->Pause();