github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-28 14:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix return to desktop mode with -nogui -bigpicture

Browse Source
This commit is contained in:
Stenzek 2025-06-17 18:36:31 +10:00
parent ce6924df21
commit d83ecb0582
No known key found for this signature in database
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/duckstation-qt/qthost.cpp
View File

@ -739,6 +739,32 @@ void EmuThread::stopFullscreenUI()
}
}
void EmuThread::exitFullscreenUI()
{
if (!isCurrentThread())
{
QMetaObject::invokeMethod(this, &EmuThread::exitFullscreenUI, Qt::QueuedConnection);
return;
}
const bool was_in_nogui_mode = std::exchange(s_nogui_mode, false);
// force a return to main window before exiting, otherwise qt will terminate the application
if (!m_is_rendering_to_main)
{
m_is_fullscreen = false;
m_is_rendering_to_main = true;
GPUThread::UpdateDisplayWindow(false);
}
// then stop as normal
stopFullscreenUI();
// if we were in nogui mode, the game list won't have been populated yet. do it now.
if (was_in_nogui_mode)
g_main_window->refreshGameList(false);
}
void EmuThread::bootSystem(std::shared_ptr<SystemBootParameters> params)
{
if (!isCurrentThread())
@ -2541,7 +2567,7 @@ void Host::RequestExitApplication(bool allow_confirm)
void Host::RequestExitBigPicture()
{
g_emu_thread->stopFullscreenUI();
g_emu_thread->exitFullscreenUI();
}
std::optional<WindowInfo> Host::GetTopLevelWindowInfo()

1
src/duckstation-qt/qthost.h
View File

@ -186,6 +186,7 @@ public Q_SLOTS:
void closeInputSources();
void startFullscreenUI();
void stopFullscreenUI();
void exitFullscreenUI();
void refreshAchievementsAllProgress();
void bootSystem(std::shared_ptr<SystemBootParameters> params);
void resumeSystemFromMostRecentState();