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

Handle cases when no simulator is available properly in simulator context

Browse Source 
In the past core was always loading one simulator plugin by default.
This has changed recently with the listeners. So m_simulator is not
guaranteed to be valid.
A proper fix in the future is to not even call them. At the moment they
are hard wired to network.
This commit is contained in:
Roland Winklmeier
2015-04-03 13:30:22 +02:00
parent 942810d714
commit ee195e3e20
1 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/blackcore/context_simulator_impl.cpp
View File

@@ -531,7 +531,15 @@ namespace BlackCore
void CContextSimulator::ps_addRemoteAircraft(const CSimulatedAircraft &remoteAircraft)
{
Q_ASSERT(m_simulator);
// todo:
// This was previously an assert and it should be one again in the future.
// This slot should not even be called when no simulator is available.
if(!m_simulator)
{
// Do something if no simulator is running
return;
}
Q_ASSERT(m_simulator->simulator);
Q_ASSERT(!remoteAircraft.getCallsign().isEmpty());
@@ -540,7 +548,15 @@ namespace BlackCore
void CContextSimulator::ps_removedRemoteAircraft(const CCallsign &callsign)
{
Q_ASSERT(m_simulator);
// todo:
// This was previously an assert and it should be one again in the future.
// This slot should not even be called when no simulator is available.
if(!m_simulator)
{
// Do something if no simulator is running
return;
}
Q_ASSERT(m_simulator->simulator);
m_simulator->simulator->removeRemoteAircraft(callsign);
@@ -561,10 +577,17 @@ namespace BlackCore
void CContextSimulator::ps_textMessagesReceived(const Network::CTextMessageList &textMessages)
{
Q_ASSERT(m_simulator);
Q_ASSERT(m_simulator->simulator);
// todo:
// This was previously an assert and it should be one again in the future.
// This slot should not even be called when no simulator is available.
if(!m_simulator)
{
// Do something if no simulator is running
return;
}
for (auto &tm: textMessages)
Q_ASSERT(m_simulator->simulator);
for (const auto &tm : textMessages)
{
m_simulator->simulator->displayTextMessage(tm);
}
@@ -591,7 +614,15 @@ namespace BlackCore
void CContextSimulator::ps_updateSimulatorCockpitFromContext(const CAircraft &ownAircraft, const QString &originator)
{
Q_ASSERT(m_simulator);
// todo:
// This was previously an assert and it should be one again in the future.
// This slot should not even be called when no simulator is available.
if(!m_simulator)
{
// Do something if no simulator is running
return;
}
Q_ASSERT(m_simulator->simulator);
// avoid loops