From 13d939d66dcc6004f89e9abc31965886a034e2cc Mon Sep 17 00:00:00 2001
From: Gus Grubba <gus@auterion.com>
Date: Sat, 27 Apr 2019 14:46:11 -0400
Subject: [PATCH] Don't allow map view to go invisible Handle connection to non
 initialized target

---
 src/FlightDisplay/FlightDisplayViewMap.qml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index c720b1568..8792d14aa 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -32,6 +32,11 @@ FlightMap {
     allowVehicleLocationCenter: !_keepVehicleCentered
     planView:                   false
 
+    onVisibleChanged: {
+        // I don't know what is causing this to become invisible when a connection is dropped
+        if(!visible) visible = true
+    }
+
     property alias  scaleState: mapScale.state
 
     // The following properties must be set by the consumer
@@ -39,7 +44,7 @@ FlightMap {
     property var    flightWidgets
     property var    rightPanelWidth
     property var    multiVehicleView                    ///< true: multi-vehicle view, false: single vehicle view
-    property var    missionController
+    property var    missionController:          null
 
     property rect   centerViewport:             Qt.rect(0, 0, width, height)
 
@@ -161,7 +166,9 @@ FlightMap {
     QGCMapPalette { id: mapPal; lightColors: isSatelliteMap }
 
     Connections {
-        target: missionController
+        enabled:                missionController !== null
+        target:                 missionController
+        ignoreUnknownSignals:   true
         onNewItemsFromVehicle: {
             var visualItems = missionController.visualItems
             if (visualItems && visualItems.count !== 1) {
-- 
2.22.0