diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-10-22 14:27:45 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-10-23 18:25:11 +0200 |
| commit | 24195884cd953966776074cb6d8df6bf01641845 (patch) | |
| tree | 6ff664bb766ca7e6c4a18a5cb775668799cd254b | |
| parent | 0a95f003a9b0cad71d8fcb88562f4050881e0ace (diff) | |
| download | NetworkManager-24195884cd953966776074cb6d8df6bf01641845.tar.gz | |
libnm-glib,vpn-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
(cherry picked from commit 842889bc5b588d191aa2c2cbcb73452ac8971cf5)
| -rw-r--r-- | libnm-glib/nm-vpn-plugin.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c index a9c4a1f886..4350e6007e 100644 --- a/libnm-glib/nm-vpn-plugin.c +++ b/libnm-glib/nm-vpn-plugin.c @@ -426,6 +426,7 @@ connect_timer_start (NMVPNPlugin *plugin) { NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); + nm_clear_g_source (&priv->connect_timer); priv->connect_timer = g_timeout_add_seconds (60, connect_timer_expired, plugin); } |