src/FlightDisplay/FlightDisplayViewMap.qml

@@ -310,6 +310,7 @@ FlightMap {
         }
 
         property bool inGotoFlightMode: _activeVehicle ? _activeVehicle.flightMode === _activeVehicle.gotoFlightMode : false
+        property var activeVehicle: _activeVehicle
 
         onInGotoFlightModeChanged: {
             if (!inGotoFlightMode && visible) {
@@ -318,6 +319,12 @@ FlightMap {
             }
         }
 
+        onActiveVehicleChanged: {
+            if (!_activeVehicle) {
+                visible = false
+            }
+        }
+
         function show(coord) {
             gotoLocationItem.coordinate = coord
             gotoLocationItem.visible = true
@@ -345,9 +352,16 @@ FlightMap {
 
         property alias center:              _mapCircle.center
         property alias clockwiseRotation:   _mapCircle.clockwiseRotation
+        property var   activeVehicle:       _activeVehicle
 
         readonly property real defaultRadius: 30
 
+        onActiveVehicleChanged: {
+            if (!_activeVehicle) {
+                visible = false
+            }
+        }
+
         function show(coord) {
             _mapCircle.radius.rawValue = defaultRadius
             orbitMapCircle.center = coord