Mercurial > pidgin.yaz

changeset 25072:5fd2102643d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid canceling this timer twice
author Mark Doliner <mark@kingant.net>
date Mon, 09 Feb 2009 22:05:14 +0000
parents cddd7961901f
children 8615b929e140
files libpurple/protocols/msn/slpcall.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/slpcall.c	Sun Feb 08 10:34:31 2009 +0000
+++ b/libpurple/protocols/msn/slpcall.c	Mon Feb 09 22:05:14 2009 +0000
@@ -47,6 +47,7 @@
 	if (!slpcall->pending && !slpcall->progress)
 	{
 		msn_slpcall_destroy(slpcall);
+		slpcall->timer = 0;
 		return FALSE;
 	}
 
@@ -222,8 +223,10 @@
 
 		if (slpcall != NULL)
 		{
-			if (slpcall->timer)
+			if (slpcall->timer) {
 				purple_timeout_remove(slpcall->timer);
+				slpcall->timer = 0;
+			}
 
 			slpcall->cb(slpcall, body, body_len);