Commit 8432278f authored by Lorenz Meier's avatar Lorenz Meier

Fixed a bunch of instantiation-order issues

parent 10d1c828
......@@ -178,6 +178,8 @@ HSIDisplay::HSIDisplay(QWidget *parent) :
connect(&statusClearTimer, SIGNAL(timeout()), this, SLOT(clearStatusMessage()));
statusClearTimer.start(3000);
setActiveUAS(UASManager::instance()->getActiveUAS());
setFocusPolicy(Qt::StrongFocus);
}
......
......@@ -15,6 +15,12 @@ QGCWaypointListMulti::QGCWaypointListMulti(QWidget *parent) :
WaypointList* list = new WaypointList(ui->stackedWidget, NULL);
lists.insert(offline_uas_id, list);
ui->stackedWidget->addWidget(list);
if (UASManager::instance()->getActiveUAS()) {
systemCreated(UASManager::instance()->getActiveUAS());
systemSetActive(UASManager::instance()->getActiveUAS()->getUASID());
}
}
void QGCWaypointListMulti::systemDeleted(QObject* uas)
......
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