Browse Source

CLosing UASManager properly, first changes to better UDP port integration

QGC4.4
oberion 14 years ago
parent
commit
c4d9885ea5
  1. 2
      src/comm/LinkInterface.h
  2. 2
      src/uas/UASManager.cc
  3. 7
      src/ui/DebugConsole.cc

2
src/comm/LinkInterface.h

@ -237,7 +237,7 @@ signals:
protected: protected:
static int getNextLinkId() { static int getNextLinkId() {
static int nextId = 0; static int nextId = 1;
return nextId++; return nextId++;
} }

2
src/uas/UASManager.cc

@ -207,6 +207,8 @@ UASManager::~UASManager()
foreach (UASInterface* mav, systems) { foreach (UASInterface* mav, systems) {
delete mav; delete mav;
} }
this->quit();
this->wait();
} }

7
src/ui/DebugConsole.cc

@ -221,7 +221,12 @@ 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()); 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) void DebugConsole::setAutoHold(bool hold)

Loading…
Cancel
Save