flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-01 22:55:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T596, do not call shutdown if close is called, as close already calls shutdown

Browse Source
This commit is contained in:
Klaus Basan
2019-04-11 02:07:44 +02:00
committed by Mat Sutcliffe
parent 5626b28ddc
commit 6f1fb20b1c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackgui/guiapplication.cpp
View File

@@ -695,9 +695,14 @@ namespace BlackGui
{ {
// a close event might already trigger a shutdown // a close event might already trigger a shutdown
if (!sGui || sGui->isShuttingDown()) { return; } if (!sGui || sGui->isShuttingDown()) { return; }
if (!this->mainApplicationWidget()) { return; }
this->mainApplicationWidget()->close(); this->mainApplicationWidget()->close();
this->gracefulShutdown();
}); // T596, do not shutdown here, as close can be canceled
// if shutdown is called, there is no way back
// this->gracefulShutdown();
},
Qt::QueuedConnection);
Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed");
Q_UNUSED(c); Q_UNUSED(c);
} }