Commit 91ee1a46 authored by Gus Grubba's avatar Gus Grubba Committed by GitHub

Merge pull request #4888 from dogmaphobic/offlineMaps

Moving Add New Set as a sibling of Map rather than a child.
parents 2673ed92 f233ac53
......@@ -200,7 +200,7 @@ DropButton {
QGCButton {
text: qsTr("Current Location")
Layout.fillWidth: true
enabled: mainWindow.gcsPosition.isValid && !followVehicleCheckBox.checked
enabled: mainWindow.gcsPosition && mainWindow.gcsPosition.isValid && !followVehicleCheckBox.checked
onClicked: {
dropButton.hideDropDown()
......
......@@ -178,7 +178,7 @@ Rectangle {
anchors.rightMargin: _margins
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
text: missionController.dirty ? qsTr("Upload Required") : qsTr("Upload")
text: missionController ? (missionController.dirty ? qsTr("Upload Required") : qsTr("Upload")) : ""
enabled: _activeVehicle
visible: _manualUpload
onClicked: missionController.upload()
......
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