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

Avoid empty callsign objects

Browse Source
This commit is contained in:
Klaus Basan
2018-09-17 18:23:51 +02:00
parent 15a563058f
commit 1f3650e7e2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackcore/airspacemonitor.cpp
View File

@@ -202,12 +202,14 @@ namespace BlackCore
CUserList users; CUserList users;
for (const CAtcStation &station : m_atcStationsOnline) for (const CAtcStation &station : m_atcStationsOnline)
{ {
const CUser user = station.getController(); CUser user = station.getController();
if (!user.hasCallsign()) { user.setCallsign(station.getCallsign()); }
users.push_back(user); users.push_back(user);
} }
for (const CSimulatedAircraft &aircraft : this->getAircraftInRange()) for (const CSimulatedAircraft &aircraft : this->getAircraftInRange())
{ {
const CUser user = aircraft.getPilot(); CUser user = aircraft.getPilot();
if (!user.hasCallsign()) { user.setCallsign(aircraft.getCallsign()); }
users.push_back(user); users.push_back(user);
} }
return users; return users;

1
src/blackmisc/aviation/callsignobjectlist.cpp
View File

@@ -232,6 +232,7 @@ namespace BlackMisc
QHash<CCallsign, OBJ> hash; QHash<CCallsign, OBJ> hash;
for (const OBJ &obj : this->container()) for (const OBJ &obj : this->container())
{ {
if (obj.getCallsign().isEmpty()) { continue; }
hash.insert(obj.getCallsign(), obj); hash.insert(obj.getCallsign(), obj);
} }
return hash; return hash;