Fix logic testing for unsaved missions on exit

src/PlanView/PlanToolBar.qml

@@ -14,8 +14,8 @@ Rectangle {
     id:                 _root
     color:              qgcPal.globalTheme === QGCPalette.Light ? Qt.rgba(1,1,1,0.8) : Qt.rgba(0,0,0,0.75)
 
-    property var    _planMasterController:      mainWindow.planMasterController
-    property var    _currentMissionItem:        mainWindow.currentMissionItem          ///< Mission item to display status for
+    property var    _planMasterController:      mainWindow.planMasterControllerPlan
+    property var    _currentMissionItem:        mainWindow.currentPlanMissionItem          ///< Mission item to display status for
 
     property var    missionItems:               _controllerValid ? _planMasterController.missionController.visualItems : undefined
     property real   missionDistance:            _controllerValid ? _planMasterController.missionController.missionDistance : NaN

src/PlanView/PlanView.qml

@@ -35,9 +35,6 @@ Item {
 
     property bool planControlColapsed: false
 
-    ///< This property is used to determine dirty state for prompting on QGC shutdown
-    readonly property bool  dirty:                      _planMasterController.dirty
-
     readonly property int   _decimalPlaces:             8
     readonly property real  _horizontalMargin:          ScreenTools.defaultFontPixelWidth  * 0.5
     readonly property real  _margin:                    ScreenTools.defaultFontPixelHeight * 0.5
@@ -188,7 +185,6 @@ Item {
             start(false /* flyView */)
             _missionController.setCurrentPlanViewIndex(0, true)
             mainWindow.planMasterControllerPlan = _planMasterController
-            mainWindow.currentPlanMissionItem   = _planMasterController.missionController.currentPlanViewItem
         }
 
         function waitingOnDataMessage() {

src/ui/MainQmlWindow.qml

@@ -43,7 +43,7 @@ ApplicationWindow {
     property string             formatedMessage:            activeVehicle ? activeVehicle.formatedMessage : ""
     property real               availableHeight:            mainWindow.height - mainWindow.header.height
 
-    property var                currentPlanMissionItem:     null
+    property var                currentPlanMissionItem:     planMasterControllerPlan ? planMasterControllerPlan.missionController.currentPlanViewItem : null
     property var                planMasterControllerPlan:   null
     property var                planMasterControllerView:   null
 
@@ -261,7 +261,7 @@ ApplicationWindow {
         visible:            false
         onYes:              activeConnectionsCloseDialog.check()
         function check() {
-            if (planViewLoader.item && planViewLoader.item.dirty) {
+            if (planMasterControllerPlan && planMasterControllerPlan.dirty) {
                 unsavedMissionCloseDialog.open()
             } else {
                 activeConnectionsCloseDialog.check()