Fix combo box updating (#9153)

10a51723 · Don Gagne · GitHub · e6e27651 · 10a51723
Unverified Commit 10a51723 authored Oct 30, 2020 by Don Gagne Committed by GitHub Oct 30, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

MultiVehicleSelector.qml src/ui/toolbar/MultiVehicleSelector.qml +3 -2

No files found.
--- a/src/ui/toolbar/MultiVehicleSelector.qml
+++ b/src/ui/toolbar/MultiVehicleSelector.qml
@@ -29,7 +29,7 @@ QGCComboBox {
    property bool showIndicator: _multipleVehicles

    property var    _activeVehicle:     QGroundControl.multiVehicleManager.activeVehicle
-    property bool   _multipleVehicles:  _activeVehicle ? QGroundControl.multiVehicleManager.vehicles.count > 1 : false
+    property bool   _multipleVehicles:  QGroundControl.multiVehicleManager.vehicles.count > 1
    property var    _vehicleModel:      [ ]

    Connections {
@@ -37,7 +37,8 @@ QGCComboBox {
        onCountChanged:  _updateVehicleModel()
    }

-    Component.onCompleted: _updateVehicleModel()
+    Component.onCompleted:      _updateVehicleModel()
+    on_ActiveVehicleChanged:    _updateVehicleModel()

    function _updateVehicleModel() {
        var newCurrentIndex = -1