Merge pull request #8185 from DonLakeFlyer/VehicleClearFailure

Vehicle clear failure

Merge pull request #8185 from DonLakeFlyer/VehicleClearFailure
Vehicle clear failure
1825eb43 · Don Gagne · GitHub · 0ca0c832 · 82694898 · 1825eb43
Unverified Commit 1825eb43 authored Dec 27, 2019 by Don Gagne Committed by GitHub Dec 27, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

CameraSection.qml src/PlanView/CameraSection.qml +1 -2

DropPanel.qml src/QmlControls/DropPanel.qml +3 -1

No files found.
--- a/src/PlanView/CameraSection.qml
+++ b/src/PlanView/CameraSection.qml
@@ -103,13 +103,12 @@ Column {
            rowSpacing:     0
            columns:        3
-            Item { width: 1; height: 1 }
+            QGCLabel { text: qsTr("Gimbal") }
            QGCLabel { text: qsTr("Pitch") }
            QGCLabel { text: qsTr("Yaw") }
            QGCCheckBox {
                id:                 gimbalCheckBox
-                text:               qsTr("Gimbal")
                checked:            _camera.specifyGimbal
                onClicked:          _camera.specifyGimbal = checked
                Layout.fillWidth:   true

--- a/src/QmlControls/DropPanel.qml
+++ b/src/QmlControls/DropPanel.qml
@@ -63,7 +63,9 @@ Item {
        if (visible) {
            visible = false
            _dropDownComponent = undefined
-            toolStrip.lastClickedButton.checked = false
+            if (toolStrip.lastClickedButton) {
+                toolStrip.lastClickedButton.checked = false
+            }
        }
    }