Update settings fix

src/ui/HDDisplay.cc

@@ -231,7 +231,7 @@ void HDDisplay::renderOverlay()
 void HDDisplay::setActiveUAS(UASInterface* uas)
 {
     //qDebug() << "ATTEMPTING TO SET UAS";
-    if (this->uas != NULL && this->uas != uas)
+    if (this->uas != NULL)
     {
         // Disconnect any previously connected active MAV
         disconnect(this->uas, SIGNAL(valueChanged(UASInterface*,QString,double,quint64)), this, SLOT(updateValue(UASInterface*,QString,double,quint64)));
@@ -239,12 +239,9 @@ void HDDisplay::setActiveUAS(UASInterface* uas)
 
     // Now connect the new UAS
 
-    if (this->uas != uas)
-    {
     //qDebug() << "UAS SET!" << "ID:" << uas->getUASID();
     // Setup communication
     connect(uas, SIGNAL(valueChanged(UASInterface*,QString,double,quint64)), this, SLOT(updateValue(UASInterface*,QString,double,quint64)));
-    }
     this->uas = uas;
 }
 

src/ui/HSIDisplay.cc

@@ -435,8 +435,6 @@ void HSIDisplay::setMetricWidth(double width)
  */
 void HSIDisplay::setActiveUAS(UASInterface* uas)
 {
-    if (this->uas != uas)
-    {
         if (this->uas != NULL)
         {
             disconnect(this->uas, SIGNAL(gpsSatelliteStatusChanged(int,int,float,float,float,bool)), this, SLOT(updateSatellite(int,int,float,float,float,bool)));
@@ -478,7 +476,6 @@ void HSIDisplay::setActiveUAS(UASInterface* uas)
 
         this->uas = uas;
 }
-}
 
 void HSIDisplay::updateSpeed(UASInterface* uas, double vx, double vy, double vz, quint64 time)
 {