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

Use thread instance comparison to check whether the listener is set up

Browse Source 
or not
This commit is contained in:
Michał Garapich
2015-06-27 15:53:16 +02:00
committed by Mathew Sutcliffe
parent 3d81199d79
commit 2a3dc05fb0
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackcore/context_simulator_impl.cpp
View File

@@ -409,7 +409,7 @@ namespace BlackCore
ISimulatorListener *listener = m_plugins->getListener(simulatorInfo.getIdentifier()); ISimulatorListener *listener = m_plugins->getListener(simulatorInfo.getIdentifier());
Q_ASSERT_X(listener, Q_FUNC_INFO, "No listener"); Q_ASSERT_X(listener, Q_FUNC_INFO, "No listener");
if (!listener->property("isInitialized").isValid() || listener->property("isInitialized").toBool() == false) if (listener->thread() != &m_listenersThread)
{ {
bool c = connect(listener, &ISimulatorListener::simulatorStarted, this, &CContextSimulator::ps_simulatorStarted); bool c = connect(listener, &ISimulatorListener::simulatorStarted, this, &CContextSimulator::ps_simulatorStarted);
if (!c) if (!c)
@@ -417,10 +417,9 @@ namespace BlackCore
CLogMessage(this).error("Unable to use '%1'") << simulatorInfo.toQString(); CLogMessage(this).error("Unable to use '%1'") << simulatorInfo.toQString();
return; return;
} }
Q_ASSERT_X(!listener->parent(), Q_FUNC_INFO, "Objects with parent cannot be moved to thread"); Q_ASSERT_X(!listener->parent(), Q_FUNC_INFO, "Objects with parent cannot be moved to thread");
listener->moveToThread(&m_listenersThread); listener->moveToThread(&m_listenersThread);
listener->setProperty("isInitialized", true);
} }
bool s = QMetaObject::invokeMethod(listener, "start", Qt::QueuedConnection); bool s = QMetaObject::invokeMethod(listener, "start", Qt::QueuedConnection);