Merge pull request #1487 from DonLakeFlyer/HDDisplayCrash

Correctly handle UAS going away

src/ui/HDDisplay.cc

@@ -473,16 +473,17 @@ void HDDisplay::renderOverlay()
  */
 void HDDisplay::setActiveUAS(UASInterface* uas)
 {
-    if (!uas)
-        return;
     // Disconnect any previously connected active UAS
     if (this->uas != NULL) {
         removeSource(this->uas);
+        this->uas = NULL;
     }
 
-    // Now connect the new UAS
+    if (uas) {
-	addSource(uas);
+        // Now connect the new UAS
-    this->uas = uas;
+        addSource(uas);
+        this->uas = uas;
+    }
 }
 
 /**