[Marble-commits] KDE/kdeedu/marble/src/lib/routing

[Dennis Nienhüser]

SVN commit 1199339 by nienhueser:

When position tracking is started by guidance mode, stop it after deactivating guidance mode.

 M  +8 -1      RoutingManager.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingManager.cpp #1199338:1199339
@@ -62,6 +62,8 @@
 
     QMutex m_fileMutex;
 
+    bool m_shutdownPositionTracking;
+
     RoutingManagerPrivate( MarbleModel *marbleModel, RoutingManager* manager, QObject *parent );
 
     GeoDataFolder* routeRequest() const;
@@ -83,7 +85,8 @@
         m_workOffline( false ),
         m_runnerManager( new MarbleRunnerManager( model->pluginManager(), q ) ),
         m_haveRoute( false ), m_adjustNavigation( 0 ),
-        m_guidanceModeEnabled( false )
+        m_guidanceModeEnabled( false ),
+        m_shutdownPositionTracking( false )
 {
     // nothing to do
 }
@@ -339,6 +342,10 @@
         }
         qDeleteAll( plugins );
         tracking->setPositionProviderPlugin( plugin );
+        d->m_shutdownPositionTracking = true;
+    } else if ( plugin && !enabled && d->m_shutdownPositionTracking ) {
+        d->m_shutdownPositionTracking = false;
+        tracking->setPositionProviderPlugin( 0 );
     }
 
     adjustNavigation()->setAutoZoom( enabled );