[telepathy-gabble/master] request-pipeline.c: Fix assert item->timer_id != 0

Alban Crequy alban.crequy at collabora.co.uk
Thu Oct 8 07:51:32 PDT 2009


See this crash:
https://bugs.edge.launchpad.net/ubuntu/+source/telepathy-gabble/+bug/445847
---
 src/request-pipeline.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/request-pipeline.c b/src/request-pipeline.c
index ea5a4ee..ba44a89 100644
--- a/src/request-pipeline.c
+++ b/src/request-pipeline.c
@@ -202,9 +202,11 @@ gabble_request_pipeline_item_cancel (GabbleRequestPipelineItem *item)
   GabbleRequestPipelinePrivate *priv =
       GABBLE_REQUEST_PIPELINE_GET_PRIVATE (item->pipeline);
 
-  g_assert (item->timer_id != 0);
-  g_source_remove (item->timer_id);
-  item->timer_id = 0;
+  if (item->timer_id != 0)
+    {
+      g_source_remove (item->timer_id);
+      item->timer_id = 0;
+    }
 
   (item->callback) (priv->connection, NULL, item->user_data, &cancelled);
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list