Qt: Fix exit on separate window close with FSUI active

stenzek · stenzek · commit d2caabd04a90 · 2025-08-03T15:15:47.000+10:00
diff --git a/src/duckstation-qt/displaywidget.cpp b/src/duckstation-qt/displaywidget.cpp
@@ -139,7 +139,7 @@ void DisplayWidget::handleCloseEvent(QCloseEvent* event)
   // In the latter case, it's going to destroy us, so don't let Qt do it first.
   // Treat a close event while fullscreen as an exit, that way ALT+F4 closes DuckStation,
   // rather than just the game.
-  if (QtHost::IsSystemValidOrStarting() && !isActuallyFullscreen())
+  if ((QtHost::IsSystemValidOrStarting() || QtHost::IsFullscreenUIStarted()) && !isActuallyFullscreen())
   {
     QMetaObject::invokeMethod(g_main_window, "requestShutdown", Qt::QueuedConnection, Q_ARG(bool, true),
                               Q_ARG(bool, true), Q_ARG(bool, false), Q_ARG(bool, true), Q_ARG(bool, true),

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ void DisplayWidget::handleCloseEvent(QCloseEvent* event)`
`139`	`139`	`// In the latter case, it's going to destroy us, so don't let Qt do it first.`
`140`	`140`	`// Treat a close event while fullscreen as an exit, that way ALT+F4 closes DuckStation,`
`141`	`141`	`// rather than just the game.`
`142`		`- if (QtHost::IsSystemValidOrStarting() && !isActuallyFullscreen())`
	`142`	`+ if ((QtHost::IsSystemValidOrStarting() \|\| QtHost::IsFullscreenUIStarted()) && !isActuallyFullscreen())`
`143`	`143`	`{`
`144`	`144`	`QMetaObject::invokeMethod(g_main_window, "requestShutdown", Qt::QueuedConnection, Q_ARG(bool, true),`
`145`	`145`	`Q_ARG(bool, true), Q_ARG(bool, false), Q_ARG(bool, true), Q_ARG(bool, true),`