Merge pull request #564 from DonLakeFlyer/ConnectFix

Failed QObject::Connect fix

src/ui/QGCConfigView.cc

@@ -95,9 +95,11 @@ void QGCConfigView::activeUASChanged(UASInterface* uas)
         }
     }
     else {
-        //restore waiting label if we no longer have a connection
-        ui->gridLayout->addWidget(ui->waitingLabel);
-        ui->waitingLabel->setVisible(true);
+        if (ui->waitingLabel) {
+            //restore waiting label if we no longer have a connection
+            ui->gridLayout->addWidget(ui->waitingLabel);
+            ui->waitingLabel->setVisible(true);
+        }
     }
 
 }

src/ui/uas/UASListWidget.cc

@@ -195,11 +195,6 @@ void UASListWidget::addUAS(UASInterface* uas)
             uasViews.insert(uas, newView);
             uasToBoxMapping[uas] = newBox;
             newBox->layout()->addWidget(newView);
-
-            // Watch for when this widget is destroyed so that we can clean up the
-            // groupbox if necessary.
-            connect(newView, SIGNAL(destroyed(QObject*)),
-                    this, SLOT(removeUASView(QObject*)));
         }
     }
 }
@@ -243,6 +238,7 @@ void UASListWidget::removeUAS(UASInterface* uas)
             if (i.value() == box)
             {
                 linkToBoxMapping.remove(i.key());
+                break;
             }
             ++i;
         }