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

refs #270 don't call CRuntime::gracefulShutdown from a different thread;

Browse Source 
connect it to the QCoreApplication::aboutToQuit signal instead
This commit is contained in:
Mathew Sutcliffe
2014-06-19 22:10:50 +01:00
parent 42d8c53290
commit fede3fc4c7
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
samples/blackcore/tool.cpp
View File

@@ -154,7 +154,6 @@ namespace BlackMiscTest
else if (line.startsWith("all")) runtime->slotLog(enable); else if (line.startsWith("all")) runtime->slotLog(enable);
} }
} }
runtime->gracefulShutdown();
QCoreApplication::quit(); QCoreApplication::quit();
} }
} // namespace } // namespace

2
src/blackcore/context_runtime.cpp
View File

@@ -305,6 +305,8 @@ namespace BlackCore
BlackSim::registerMetadata(); BlackSim::registerMetadata();
BlackCore::registerMetadata(); BlackCore::registerMetadata();
this->connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, &CRuntime::gracefulShutdown);
// upfront reading of settings, as DBus server already relies on settings // upfront reading of settings, as DBus server already relies on settings
CContextSettings *settings = nullptr; CContextSettings *settings = nullptr;
QString dbusAddress; QString dbusAddress;

2
src/blackcore/context_runtime.h
View File

@@ -139,7 +139,7 @@ namespace BlackCore
//! Slot logging for bool value from a specific context //! Slot logging for bool value from a specific context
void logSlot(LogContext ctx, const char *func, bool boolValue) const; void logSlot(LogContext ctx, const char *func, bool boolValue) const;
//! shutdown //! Clean up (will be connected to signal QCoreApplication::aboutToQuit)
void gracefulShutdown(); void gracefulShutdown();
// ------- Context as interface, normal way to access a context // ------- Context as interface, normal way to access a context