Commit c4d9885e authored by oberion's avatar oberion

CLosing UASManager properly, first changes to better UDP port integration

parent b468fd50
......@@ -237,7 +237,7 @@ signals:
protected:
static int getNextLinkId() {
static int nextId = 0;
static int nextId = 1;
return nextId++;
}
......
......@@ -207,6 +207,8 @@ UASManager::~UASManager()
foreach (UASInterface* mav, systems) {
delete mav;
}
this->quit();
this->wait();
}
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment