From a5feb44a444171dfdc02b91d0e39d281dae159a2 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 22 Oct 2015 14:27:45 +0200 Subject: [PATCH] libnm,vpn-service-plugin: remove old connect timer when adding new one If the plugin didn't succeed connecting once, don't let the old timer fire during a subsequent connection. https://bugzilla.redhat.com/show_bug.cgi?id=1271973 --- libnm/nm-vpn-service-plugin.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index 2945a4ea6..25215d96a 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -424,6 +424,7 @@ connect_timer_start (NMVpnServicePlugin *plugin) { NMVpnServicePluginPrivate *priv = NM_VPN_SERVICE_PLUGIN_GET_PRIVATE (plugin); + nm_clear_g_source (&priv->connect_timer); priv->connect_timer = g_timeout_add_seconds (60, connect_timer_expired, plugin); }