Browse Source

Merge pull request #6247 from DonLakeFlyer/Fixes

Random fixes
QGC4.4
Don Gagne 7 years ago committed by GitHub
parent
commit
9b9b9d7492
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      src/MissionManager/PlanMasterController.cc
  2. 2
      src/ui/QGCMapRCToParamDialog.cpp

5
src/MissionManager/PlanMasterController.cc

@ -416,6 +416,11 @@ void PlanMasterController::removeAll(void)
_missionController.removeAll(); _missionController.removeAll();
_geoFenceController.removeAll(); _geoFenceController.removeAll();
_rallyPointController.removeAll(); _rallyPointController.removeAll();
if (_offline) {
_missionController.setDirty(false);
_geoFenceController.setDirty(false);
_rallyPointController.setDirty(false);
}
} }
void PlanMasterController::removeAllFromVehicle(void) void PlanMasterController::removeAllFromVehicle(void)

2
src/ui/QGCMapRCToParamDialog.cpp

@ -43,7 +43,7 @@ QGCMapRCToParamDialog::QGCMapRCToParamDialog(QString param_id, UASInterface *mav
ui->paramIdLabel->setText(param_id); ui->paramIdLabel->setText(param_id);
connect(paramFact, &Fact::valueChanged, this, &QGCMapRCToParamDialog::_parameterUpdated); connect(paramFact, &Fact::vehicleUpdated, this, &QGCMapRCToParamDialog::_parameterUpdated);
vehicle->parameterManager()->refreshParameter(FactSystem::defaultComponentId, param_id); vehicle->parameterManager()->refreshParameter(FactSystem::defaultComponentId, param_id);
} }

Loading…
Cancel
Save