From 8432278f72948b8e6d441d973a2b574465b5eca4 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Tue, 21 May 2013 22:27:57 +0200 Subject: [PATCH] Fixed a bunch of instantiation-order issues --- src/ui/HSIDisplay.cc | 2 ++ src/ui/QGCWaypointListMulti.cc | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/ui/HSIDisplay.cc b/src/ui/HSIDisplay.cc index 736b5f279..624353d16 100644 --- a/src/ui/HSIDisplay.cc +++ b/src/ui/HSIDisplay.cc @@ -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); } diff --git a/src/ui/QGCWaypointListMulti.cc b/src/ui/QGCWaypointListMulti.cc index 53a0065df..9cbe050d7 100644 --- a/src/ui/QGCWaypointListMulti.cc +++ b/src/ui/QGCWaypointListMulti.cc @@ -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) -- 2.22.0