flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-30 05:51:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Close modal widgets on shutdown and

Browse Source 
"kill" still floating dock widgets (HACK!)
This commit is contained in:
Klaus Basan
2020-03-30 20:28:13 +02:00
committed by Mat Sutcliffe
parent 53ed37d7fd
commit 53bd5e6be7
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/blackgui/guiapplication.cpp
View File

@@ -1323,14 +1323,35 @@ namespace BlackGui
void CGuiApplication::gracefulShutdown() void CGuiApplication::gracefulShutdown()
{ {
if (m_shutdown) { return; }
if (m_shutdownInProgress) { return; } if (m_shutdownInProgress) { return; }
CApplication::gracefulShutdown();
CLogMessage(this).info(u"Graceful shutdown of GUI application started"); CLogMessage(this).info(u"Graceful shutdown of GUI application started");
if (m_saveMainWidgetState) if (m_saveMainWidgetState)
{ {
CLogMessage(this).info(u"Graceful shutdown, saving geometry"); CLogMessage(this).info(u"Graceful shutdown, saving geometry");
this->saveWindowGeometryAndState(); this->saveWindowGeometryAndState();
} }
// shut down whole infrastructure
CApplication::gracefulShutdown();
// precautions to avoid hanging closing swift
const QStringList modals = CGuiUtility::closeAllModalWidgetsGetTitles();
if (modals.count() > 0)
{
// that is a pretty normal situation
CLogMessage(this).info(u"Graceful shutdown, still %1 modal widget(s), closed: %2") << modals.count() << modals.join(", ");
}
//! \todo KB 3-2020 remove as soon as the info status bar blocks shutdown bug is fixed
//! ref: https://discordapp.com/channels/539048679160676382/539846348275449887/693848134811517029
const QStringList docks = CGuiUtility::deleteLaterAllDockWidgetsGetTitles(this->mainApplicationWidget(), true);
if (docks.count() > 0)
{
// that should not happen
CLogMessage(this).warning(u"Graceful shutdown, still %1 floating dock widget(s), closed: %2") << docks.count() << docks.join(", ");
}
} }
void CGuiApplication::settingsChanged() void CGuiApplication::settingsChanged()