From b6dbe95178ae731b4e26cc38aae0e677f19c02ba Mon Sep 17 00:00:00 2001
From: Gus Grubba <gus@auterion.com>
Date: Wed, 15 May 2019 17:59:29 -0400
Subject: [PATCH] Fix runtime QML warnings

---
 src/VehicleSetup/SetupView.qml | 2 +-
 src/ui/toolbar/MainToolBar.qml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/VehicleSetup/SetupView.qml b/src/VehicleSetup/SetupView.qml
index 7a1804f52..ca6a2b942 100644
--- a/src/VehicleSetup/SetupView.qml
+++ b/src/VehicleSetup/SetupView.qml
@@ -102,7 +102,7 @@ Rectangle {
 
         onParameterReadyVehicleAvailableChanged: {
             if(!QGroundControl.skipSetupPage) {
-                if (parameterReadyVehicleAvailable || summaryButton.checked || setupButtonGroup.current != firmwareButton) {
+                if (QGroundControl.multiVehicleManager.parameterReadyVehicleAvailable || summaryButton.checked || setupButtonGroup.current != firmwareButton) {
                     // Show/Reload the Summary panel when:
                     //      A new vehicle shows up
                     //      The summary panel is already showing and the active vehicle goes away
diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml
index 9f1e1a6f5..0d12bf021 100644
--- a/src/ui/toolbar/MainToolBar.qml
+++ b/src/ui/toolbar/MainToolBar.qml
@@ -38,9 +38,9 @@ Item {
 
     //-- Setup can be invoked from c++ side
     Connections {
-        target: mainContentWindow
-        onSourceChanged: {
-            if(mainContentWindow.source.toString().endsWith(setupViewSource)) {
+        target: setupWindow
+        onVisibleChanged: {
+            if(setupWindow.visible) {
                 setupButton.checked = true
             }
         }
-- 
2.22.0