From 01179ac097a5729e53141ff31945b8c6f89bf876 Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <don@thegagnes.com>
Date: Wed, 12 Apr 2017 12:51:44 -0700
Subject: [PATCH] Fix dirty bit after removeAll

---
 src/MissionManager/MissionController.cc | 18 ++----------------
 src/MissionManager/MissionController.h  |  1 -
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc
index 810fe4f7e..75d213efb 100644
--- a/src/MissionManager/MissionController.cc
+++ b/src/MissionManager/MissionController.cc
@@ -1255,7 +1255,7 @@ void MissionController::_initAllVisualItems(void)
 
     _recalcAll();
 
-    connect(_visualItems, &QmlObjectListModel::dirtyChanged, this, &MissionController::_visualItemsDirtyChanged);
+    connect(_visualItems, &QmlObjectListModel::dirtyChanged, this, &MissionController::dirtyChanged);
     connect(_visualItems, &QmlObjectListModel::countChanged, this, &MissionController::_updateContainsItems);
 
     emit visualItemsChanged();
@@ -1274,7 +1274,7 @@ void MissionController::_deinitAllVisualItems(void)
         _deinitVisualItem(qobject_cast<VisualMissionItem*>(_visualItems->get(i)));
     }
 
-    disconnect(_visualItems, &QmlObjectListModel::dirtyChanged, this, &MissionController::_visualItemsDirtyChanged);
+    disconnect(_visualItems, &QmlObjectListModel::dirtyChanged, this, &MissionController::dirtyChanged);
     disconnect(_visualItems, &QmlObjectListModel::countChanged, this, &MissionController::_updateContainsItems);
 }
 
@@ -1586,20 +1586,6 @@ QStringList MissionController::complexMissionItemNames(void) const
     return complexItems;
 }
 
-void MissionController::_visualItemsDirtyChanged(bool dirty)
-{
-    if (dirty) {
-        if (_visualItems->count() > 1) {
-            emit dirtyChanged(true);
-        } else {
-            // This was a change to mission settings with no other mission items added
-            _visualItems->setDirty(false);
-        }
-    } else {
-        emit dirtyChanged(false);
-    }
-}
-
 void MissionController::resumeMission(int resumeIndex)
 {
     if (!_activeVehicle->firmwarePlugin()->sendHomePositionToVehicle()) {
diff --git a/src/MissionManager/MissionController.h b/src/MissionManager/MissionController.h
index 202422cbc..125bbe3fd 100644
--- a/src/MissionManager/MissionController.h
+++ b/src/MissionManager/MissionController.h
@@ -171,7 +171,6 @@ private slots:
     void _recalcWaypointLines(void);
     void _recalcMissionFlightStatus(void);
     void _updateContainsItems(void);
-    void _visualItemsDirtyChanged(bool dirty);
 
 private:
     void _init(void);
-- 
2.22.0