Commit d9f955e2 authored by DonLakeFlyer's avatar DonLakeFlyer

emit loadComplete even when fence/rally not supported

parent da85f6bb
...@@ -103,6 +103,7 @@ void APMGeoFenceManager::loadFromVehicle(void) ...@@ -103,6 +103,7 @@ void APMGeoFenceManager::loadFromVehicle(void)
_polygon.clear(); _polygon.clear();
if (!_fenceSupported) { if (!_fenceSupported) {
emit loadComplete(_breachReturnPoint, _polygon);
return; return;
} }
......
...@@ -53,12 +53,17 @@ void APMRallyPointManager::sendToVehicle(const QList<QGeoCoordinate>& rgPoints) ...@@ -53,12 +53,17 @@ void APMRallyPointManager::sendToVehicle(const QList<QGeoCoordinate>& rgPoints)
void APMRallyPointManager::loadFromVehicle(void) void APMRallyPointManager::loadFromVehicle(void)
{ {
if (_vehicle->isOfflineEditingVehicle() || !rallyPointsSupported() || _readTransactionInProgress) { if (_vehicle->isOfflineEditingVehicle() || _readTransactionInProgress) {
return; return;
} }
_rgPoints.clear(); _rgPoints.clear();
if (!rallyPointsSupported()) {
emit loadComplete(QList<QGeoCoordinate>());
return;
}
_cReadRallyPoints = _vehicle->parameterManager()->getParameter(FactSystem::defaultComponentId, _rallyTotalParam)->rawValue().toInt(); _cReadRallyPoints = _vehicle->parameterManager()->getParameter(FactSystem::defaultComponentId, _rallyTotalParam)->rawValue().toInt();
qCDebug(RallyPointManagerLog) << "APMRallyPointManager::loadFromVehicle - point count" << _cReadRallyPoints; qCDebug(RallyPointManagerLog) << "APMRallyPointManager::loadFromVehicle - point count" << _cReadRallyPoints;
if (_cReadRallyPoints == 0) { if (_cReadRallyPoints == 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment