Disconnect signals and force initial request complete if possible

src/MissionManager/PlanMasterController.cc

@@ -89,6 +89,16 @@ void PlanMasterController::_activeVehicleChanged(Vehicle* activeVehicle)
 
     qCDebug(PlanMasterControllerLog) << "_activeVehicleChanged" << activeVehicle;
 
+    if (_managerVehicle) {
+        // Disconnect old vehicle
+        disconnect(_managerVehicle->missionManager(),       &MissionManager::newMissionItemsAvailable,  this, &PlanMasterController::_loadMissionComplete);
+        disconnect(_managerVehicle->geoFenceManager(),      &GeoFenceManager::loadComplete,             this, &PlanMasterController::_loadGeoFenceComplete);
+        disconnect(_managerVehicle->rallyPointManager(),    &RallyPointManager::loadComplete,           this, &PlanMasterController::_loadRallyPointsComplete);
+        disconnect(_managerVehicle->missionManager(),       &MissionManager::sendComplete,              this, &PlanMasterController::_sendMissionComplete);
+        disconnect(_managerVehicle->geoFenceManager(),      &GeoFenceManager::sendComplete,             this, &PlanMasterController::_sendGeoFenceComplete);
+        disconnect(_managerVehicle->rallyPointManager(),    &RallyPointManager::sendComplete,           this, &PlanMasterController::_sendRallyPointsComplete);
+    }
+
     bool newOffline = false;
     if (activeVehicle == NULL) {
         // Since there is no longer an active vehicle we use the offline controller vehicle as the manager vehicle
@@ -353,6 +363,7 @@ void PlanMasterController::removeAllFromVehicle(void)
         _missionController.removeAllFromVehicle();
         _geoFenceController.removeAllFromVehicle();
         _rallyPointController.removeAllFromVehicle();
+        setDirty(false);
     } else {
         qWarning() << "PlanMasterController::removeAllFromVehicle called while offline";
     }
@@ -410,6 +421,14 @@ void PlanMasterController::sendPlanToVehicle(Vehicle* vehicle, const QString& fi
 
 void PlanMasterController::_showPlanFromManagerVehicle(void)
 {
+    if (!_managerVehicle->initialPlanRequestComplete() &&
+            !_missionController.syncInProgress() &&
+            !_geoFenceController.syncInProgress() &&
+            !_rallyPointController.syncInProgress()) {
+        // Something went wrong with initial load. All controllers are idle, so just force it off
+        _managerVehicle->forceInitialPlanRequestComplete();
+    }
+
     // The crazy if structure is to handle the load propogating by itself through the system
     if (!_missionController.showPlanFromManagerVehicle()) {
         if (!_geoFenceController.showPlanFromManagerVehicle()) {