From: mattcallow <mattcallow@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Mon, 3 Mar 2008 23:30:38 +0000 (+0000)
Subject: fix:gpsd:Ensure retry timer is cancelled when connection is closed
X-Git-Tag: navit-0.5.0.5194svn~4215
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3de379eb54bb5c86fc3c0836dccbe59cb45974ee;p=profile%2Fivi%2Fnavit.git

fix:gpsd:Ensure retry timer is cancelled when connection is closed


git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@937 ffa7fe5e-494d-0410-b361-a75ebd5db220
---

diff --git a/navit/src/vehicle/gpsd/vehicle_gpsd.c b/navit/src/vehicle/gpsd/vehicle_gpsd.c
index 7a2b25b..9bd369e 100644
--- a/navit/src/vehicle/gpsd/vehicle_gpsd.c
+++ b/navit/src/vehicle/gpsd/vehicle_gpsd.c
@@ -27,6 +27,7 @@ static struct vehicle_priv {
 	int sats_used;
 	char *nmea_data;
         char *nmea_data_buf;
+	guint retry_timer;
 } *vehicle_last;
 
 #define DEFAULT_RETRY_INTERVAL 10 // seconds
@@ -140,8 +141,9 @@ vehicle_gpsd_try_open(gpointer *data)
 static void
 vehicle_gpsd_open(struct vehicle_priv *priv)
 {
+	priv->retry_timer=0;
 	if (vehicle_gpsd_try_open((gpointer *)priv)) {
-		g_timeout_add(priv->retry_interval*1000, (GSourceFunc)vehicle_gpsd_try_open, (gpointer *)priv);
+		priv->retry_timer = g_timeout_add(priv->retry_interval*1000, (GSourceFunc)vehicle_gpsd_try_open, (gpointer *)priv);
 	}
 }
 
@@ -154,6 +156,10 @@ vehicle_gpsd_close(struct vehicle_priv *priv)
 		g_source_remove(priv->watch);
 		priv->watch = 0;
 	}
+	if (priv->retry_timer) {
+		g_source_remove(priv->retry_timer);
+		priv->retry_timer=0;
+	}
 	if (priv->iochan) {
 		g_io_channel_shutdown(priv->iochan, 0, &error);
 		priv->iochan = NULL;