From c4d9885ea5f412c696857dc502e04b95912b78ad Mon Sep 17 00:00:00 2001
From: oberion <dabuuschti@hotmail.de>
Date: Fri, 16 Sep 2011 09:18:27 +0200
Subject: [PATCH] CLosing UASManager properly, first changes to better UDP port
 integration

---
 src/comm/LinkInterface.h | 2 +-
 src/uas/UASManager.cc    | 2 ++
 src/ui/DebugConsole.cc   | 9 +++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/comm/LinkInterface.h b/src/comm/LinkInterface.h
index 72e2dd2..b9b8867 100644
--- a/src/comm/LinkInterface.h
+++ b/src/comm/LinkInterface.h
@@ -237,7 +237,7 @@ signals:
 
 protected:
     static int getNextLinkId() {
-        static int nextId = 0;
+        static int nextId = 1;
         return nextId++;
     }
 
diff --git a/src/uas/UASManager.cc b/src/uas/UASManager.cc
index a105b86..dcb334f 100644
--- a/src/uas/UASManager.cc
+++ b/src/uas/UASManager.cc
@@ -207,6 +207,8 @@ UASManager::~UASManager()
     foreach (UASInterface* mav, systems) {
         delete mav;
     }
+	this->quit();
+	this->wait();
 }
 
 
diff --git a/src/ui/DebugConsole.cc b/src/ui/DebugConsole.cc
index a65e6de..c05231e 100644
--- a/src/ui/DebugConsole.cc
+++ b/src/ui/DebugConsole.cc
@@ -219,9 +219,14 @@ void DebugConsole::linkSelected(int linkId)
  */
 void DebugConsole::updateLinkName(QString name)
 {
-    // Set name if signal came from a link
+	// Set name if signal came from a link
     LinkInterface* link = qobject_cast<LinkInterface*>(sender());
-    if (link != NULL) m_ui->linkComboBox->setItemText(link->getId(), name);
+	//if (link != NULL) m_ui->linkComboBox->setItemText(link->getId(), name);
+	if((link != NULL) && (links.contains(link)))
+	{
+		const qint16 &linkIndex(links.indexOf(link));
+		m_ui->linkComboBox->setItemText(linkIndex,name);
+	}
 }
 
 void DebugConsole::setAutoHold(bool hold)