Merge branch 'jb42631' into 'mer-5.9'

Geoclue: respect minimum update interval for satellite info updates See merge request mer-core/qtlocation!16
sailfishos · Aug 30, 2018 · f920fe3 · f920fe3
2 parents 0008c4b + 7390946
commit f920fe3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp
@@ -96,7 +96,7 @@ void QGeoSatelliteInfoSourceGeoclueMaster::startUpdates()
     if (!m_master->hasMasterClient())
         configureSatelliteSource();
 
-    m_requestTimer.start(updateInterval());
+    m_requestTimer.start(qMax(updateInterval(), minimumUpdateInterval()));
 }
 
 void QGeoSatelliteInfoSourceGeoclueMaster::stopUpdates()
@@ -173,7 +173,7 @@ void QGeoSatelliteInfoSourceGeoclueMaster::updateSatelliteInfo(int timestamp, in
     m_inUse = inUse;
     emit satellitesInUseUpdated(m_inUse);
 
-    m_requestTimer.start(updateInterval());
+    m_requestTimer.start(qMax(updateInterval(), minimumUpdateInterval()));
 }
 
 void QGeoSatelliteInfoSourceGeoclueMaster::requestUpdateTimeout()