From 12211654baa75db13a05b5c2b3293d1378fcf7a2 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 14 Feb 2014 12:12:54 +0100 Subject: idle-connection: make sure to always reset force_disconnect_id Recent GLib raises a critical when trying to remove an invalid source. --- src/idle-connection.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/idle-connection.c b/src/idle-connection.c index 6f61e6b..9ee8840 100644 --- a/src/idle-connection.c +++ b/src/idle-connection.c @@ -587,6 +587,7 @@ static gboolean _finish_shutdown_idle_func(gpointer data) { IdleConnectionPrivate *priv = self->priv; if (priv->force_disconnect_id != 0) { g_source_remove(priv->force_disconnect_id); + priv->force_disconnect_id = 0; } tp_base_connection_finish_shutdown(conn); @@ -602,6 +603,7 @@ _force_disconnect (gpointer data) IDLE_DEBUG("gave up waiting, forcibly disconnecting"); idle_server_connection_force_disconnect(priv->conn); + priv->force_disconnect_id = 0; return FALSE; } -- cgit v1.2.1