Commit c40fc59e authored by Gus Grubba's avatar Gus Grubba

Handle warnings

parent 848fc0a4
......@@ -357,7 +357,7 @@ FlightMap {
// Used to show orbit status telemetry from the vehicle
QGCMapCircleVisuals {
mapControl: parent
mapCircle: _activeVehicle.orbitMapCircle
mapCircle: _activeVehicle ? _activeVehicle.orbitMapCircle : null
visible: _activeVehicle ? _activeVehicle.orbitActive : false
}
......@@ -396,7 +396,7 @@ FlightMap {
onClicked: {
if (guidedActionsController.guidedUIVisible || (!guidedActionsController.showGotoLocation && !guidedActionsController.showOrbit)) {
return
}
}
orbitMapCircle.hide()
gotoLocationItem.hide()
var clickCoord = flightMap.toCoordinate(Qt.point(mouse.x, mouse.y), false /* clipToViewPort */)
......
......@@ -22,9 +22,9 @@ import QGroundControl.FlightMap 1.0
Item {
id: _root
property var mapControl ///< Map control to place item in
property var mapCircle ///< QGCMapCircle object
property bool interactive: mapCircle.interactive /// true: user can manipulate polygon
property var mapControl ///< Map control to place item in
property var mapCircle ///< QGCMapCircle object
property bool interactive: mapCircle ? mapCircle.interactive : 0 /// true: user can manipulate polygon
property color interiorColor: "transparent"
property real interiorOpacity: 1
property int borderWidth: 2
......@@ -34,7 +34,7 @@ Item {
property var _topRotationIndicatorComponent
property var _bottomRotationIndicatorComponent
property var _dragHandlesComponent
property real _radius: mapCircle.radius.rawValue
property real _radius: mapCircle ? mapCircle.radius.rawValue : 0
function addVisuals() {
if (!_circleComponent) {
......
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