summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2020-03-28 00:28:31 -0400
committerGravatar GitHub2020-03-28 00:28:31 -0400
commit9bd998037265d97179962fb9d2e500a05caad3dc (patch)
tree68c39d50412683dd50e03e4e93937f0e7cea2c51 /src
parentMerge pull request #3574 from FearlessTobi/port-5093 (diff)
parentyuzu: fix the stuck in fullscreen mode bug (diff)
downloadyuzu-9bd998037265d97179962fb9d2e500a05caad3dc.tar.gz
yuzu-9bd998037265d97179962fb9d2e500a05caad3dc.tar.xz
yuzu-9bd998037265d97179962fb9d2e500a05caad3dc.zip
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')
-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) {
1034} 1034}
1035 1035
1036void GMainWindow::ShutdownGame() { 1036void GMainWindow::ShutdownGame() {
1037 if (!emulation_running) {
1038 return;
1039 }
1040
1041 if (ui.action_Fullscreen->isChecked()) {
1042 HideFullscreen();
1043 }
1044
1037 AllowOSSleep(); 1045 AllowOSSleep();
1038 1046
1039 discord_rpc->Pause(); 1047 discord_rpc->Pause();