diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-02-21 17:16:17 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-02-21 17:16:17 +0100 |
| commit | 1052e3cdb51687720b39e61adb13cb6c3562b258 (patch) | |
| tree | ffd07ad6322d3ffb1da010f6adc509fa71bec7ad | |
| parent | 1bacdb71ff397d5fa930f0e5e648c470b115e8da (diff) | |
| parent | 2133096fab8dddb4305ea2673d2de15c78bd638d (diff) | |
Merge branch 'master' into next
| -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), |