[svn-commits] branch 1.2 r8808 - /branches/1.2/channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: oej
Date: Sat Jan 28 07:52:15 2006
New Revision: 8808

URL: http://svn.digium.com/view/asterisk?rev=8808&view=rev
Log:
Issue 6182 - Don't remove scheduled event until it's really done. 
(reported by malverian) 

Modified:
    branches/1.2/channels/chan_sip.c

Modified: branches/1.2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_sip.c?rev=8808&r1=8807&r2=8808&view=diff
==============================================================================
--- branches/1.2/channels/chan_sip.c (original)
+++ branches/1.2/channels/chan_sip.c Sat Jan 28 07:52:15 2006
@@ -1300,7 +1300,6 @@
 {
 	struct sip_pvt *p = data;
 
-	p->autokillid = -1;
 
 	/* If this is a subscription, tell the phone that we got a timeout */
 	if (p->subscribed) {
@@ -1310,6 +1309,10 @@
 		append_history(p, "Subscribestatus", "timeout");
 		return 10000;	/* Reschedule this destruction so that we know that it's gone */
 	}
+
+	/* This scheduled event is now considered done. */
+	p->autokillid = -1;
+
 	ast_log(LOG_DEBUG, "Auto destroying call '%s'\n", p->callid);
 	append_history(p, "AutoDestroy", "");
 	if (p->owner) {