From 1f3650e7e250b8023095d94bbf9828295368d71b Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Mon, 17 Sep 2018 18:23:51 +0200
Subject: [PATCH] Avoid empty callsign objects

---
 src/blackcore/airspacemonitor.cpp             | 6 ++++--
 src/blackmisc/aviation/callsignobjectlist.cpp | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp
index 90a2ccb1b..9d1138766 100644
--- a/src/blackcore/airspacemonitor.cpp
+++ b/src/blackcore/airspacemonitor.cpp
@@ -202,12 +202,14 @@ namespace BlackCore
         CUserList users;
         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);
         }
         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);
         }
         return users;
diff --git a/src/blackmisc/aviation/callsignobjectlist.cpp b/src/blackmisc/aviation/callsignobjectlist.cpp
index a0068890c..91c591ba5 100644
--- a/src/blackmisc/aviation/callsignobjectlist.cpp
+++ b/src/blackmisc/aviation/callsignobjectlist.cpp
@@ -232,6 +232,7 @@ namespace BlackMisc
             QHash<CCallsign, OBJ> hash;
             for (const OBJ &obj : this->container())
             {
+                if (obj.getCallsign().isEmpty()) { continue; }
                 hash.insert(obj.getCallsign(), obj);
             }
             return hash;