From 10d1c8280b58b10288eb621dc1f592eac718e775 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Tue, 21 May 2013 22:14:04 +0200
Subject: [PATCH] Fixed another init bug

---
 src/ui/HDDisplay.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ui/HDDisplay.cc b/src/ui/HDDisplay.cc
index cfeaae7..f83027e 100644
--- a/src/ui/HDDisplay.cc
+++ b/src/ui/HDDisplay.cc
@@ -128,8 +128,8 @@ HDDisplay::HDDisplay(QStringList* plotList, QString title, QWidget *parent) :
     if (font.family() != fontFamilyName) qDebug() << "ERROR! Font not loaded: " << fontFamilyName;
 
     // Connect with UAS
-    connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(setActiveUAS(UASInterface*)));
-    //start();
+    connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(setActiveUAS(UASInterface*)), Qt::UniqueConnection);
+    setActiveUAS(UASManager::instance()->getActiveUAS());
 }
 
 HDDisplay::~HDDisplay()
@@ -476,6 +476,8 @@ void HDDisplay::renderOverlay()
  */
 void HDDisplay::setActiveUAS(UASInterface* uas)
 {
+    if (!uas)
+        return;
     // Disconnect any previously connected active UAS
     if (this->uas != NULL) {
         removeSource(this->uas);