Merge branch 'release/20.08' into master

a07ed2ea · Antonio Rojas · af6e619f · 7039b70f · a07ed2ea
Commit a07ed2ea authored Aug 05, 2020 by Antonio Rojas
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp ...gins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp +4 -0

No files found.
--- a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
@@ -79,7 +79,11 @@ void GpsdPositionProviderPlugin::update( gps_data_t data )
 {
    PositionProviderStatus oldStatus = m_status;
    GeoDataCoordinates oldPosition = m_position;
+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 10 )
+    if ( data.fix.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) )
+#else
    if ( data.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) )
+#endif
        m_status = PositionProviderStatusAcquiring;
    else {
        m_status = PositionProviderStatusAvailable;