diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-02-14 12:05:05 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-02-14 12:05:46 +0100 |
| commit | d17d9e4c31d1e648d7f28827e1320f9cf5108dc3 (patch) | |
| tree | 3ded515beb57136f5e5e222103b9769294e95417 | |
| parent | 33430f006934add269f6858dc7b9af6eadbc30ca (diff) | |
| download | telepathy-salut-d17d9e4c31d1e648d7f28827e1320f9cf5108dc3.tar.gz | |
multicast-causal-transport: make sure to always reset keepalive_timer
Recent GLib raises a critical when trying to remove an invalid source.
| -rw-r--r-- | lib/gibber/gibber-r-multicast-causal-transport.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gibber/gibber-r-multicast-causal-transport.c b/lib/gibber/gibber-r-multicast-causal-transport.c index 1ec2f9f3..f6952c53 100644 --- a/lib/gibber/gibber-r-multicast-causal-transport.c +++ b/lib/gibber/gibber-r-multicast-causal-transport.c @@ -286,6 +286,7 @@ gibber_r_multicast_causal_transport_dispose (GObject *object) if (priv->keepalive_timer != 0) { g_source_remove (priv->keepalive_timer); + priv->keepalive_timer = 0; } if (priv->self != NULL) @@ -1223,6 +1224,7 @@ do_disconnect (GibberRMulticastCausalTransport *transport) if (priv->keepalive_timer != 0) { g_source_remove (priv->keepalive_timer); + priv->keepalive_timer = 0; } gibber_transport_set_state (GIBBER_TRANSPORT (self), |