From 2a9f3d60395d5e2d729605989c04604d8c2db915 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 28 Jun 2014 02:09:20 +0200
Subject: [PATCH] Tweaks * check if parent is null * comments * icon in column
 * nullptr check in runtime based component

---
 src/blackcore/airspace_monitor.cpp     | 1 +
 src/blackgui/runtimebasedcomponent.cpp | 4 ++--
 src/blackgui/timerbasedcomponent.cpp   | 2 +-
 src/blackgui/userlistmodel.cpp         | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/blackcore/airspace_monitor.cpp b/src/blackcore/airspace_monitor.cpp
index 8137749ab..bb9368d73 100644
--- a/src/blackcore/airspace_monitor.cpp
+++ b/src/blackcore/airspace_monitor.cpp
@@ -35,6 +35,7 @@ namespace BlackCore
         this->connect(this->m_network, &INetwork::fsipirCustomPacketReceived, this, &CAirspaceMonitor::fsipirCustomPacketReceived);
         this->connect(this->m_network, &INetwork::serverReplyReceived, this, &CAirspaceMonitor::serverReplyReceived);
 
+        // AutoConnection: this should also avoid race conditions by updating the bookings
         this->connect(this->m_vatsimBookingReader, &CVatsimBookingReader::dataRead, this, &CAirspaceMonitor::receivedBookings);
     }
 
diff --git a/src/blackgui/runtimebasedcomponent.cpp b/src/blackgui/runtimebasedcomponent.cpp
index 91c62ebde..fbd32dad5 100644
--- a/src/blackgui/runtimebasedcomponent.cpp
+++ b/src/blackgui/runtimebasedcomponent.cpp
@@ -34,13 +34,13 @@ namespace BlackGui
 
     void CRuntimeBasedComponent::sendStatusMessage(const BlackMisc::CStatusMessage &statusMessage)
     {
-        Q_ASSERT(this->getIContextApplication());
+        if (!this->getIContextApplication()) return;
         this->getIContextApplication()->sendStatusMessage(statusMessage);
     }
 
     void CRuntimeBasedComponent::sendStatusMessages(const BlackMisc::CStatusMessageList &statusMessages)
     {
-        Q_ASSERT(this->getIContextApplication());
+        if (!this->getIContextApplication()) return;
         this->getIContextApplication()->sendStatusMessages(statusMessages);
     }
 
diff --git a/src/blackgui/timerbasedcomponent.cpp b/src/blackgui/timerbasedcomponent.cpp
index 82bc4bfc8..38bb3052d 100644
--- a/src/blackgui/timerbasedcomponent.cpp
+++ b/src/blackgui/timerbasedcomponent.cpp
@@ -13,7 +13,7 @@ namespace BlackGui
     CTimerBasedComponent::~CTimerBasedComponent()
     {
         this->m_timer->stop();
-        this->disconnect(this->parent());
+        if (this->parent()) this->disconnect(this->parent());
     }
 
     void CTimerBasedComponent::setUpdateInterval(int milliSeconds)
diff --git a/src/blackgui/userlistmodel.cpp b/src/blackgui/userlistmodel.cpp
index 3e0db34f1..9c47b7229 100644
--- a/src/blackgui/userlistmodel.cpp
+++ b/src/blackgui/userlistmodel.cpp
@@ -41,7 +41,7 @@ namespace BlackGui
             break;
 
         case UserShort:
-            this->m_columns.addColumn(CColumn("", CUser::IndexCallsignIcon));
+            this->m_columns.addColumn(CColumn(CUser::IndexCallsignIcon, true));
             this->m_columns.addColumn(CColumn("realname", CUser::IndexRealName));
             this->m_columns.addColumn(CColumn("callsign", CUser::IndexCallsign));
             break;