From 06765cc9d14f6a12f2cb7502a0fb71772f82aedb Mon Sep 17 00:00:00 2001
From: Automerge script <automerge@asterisk.org>
Date: Sat, 28 Jan 2006 14:01:17 +0000
Subject: [PATCH] automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@8818 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/chan_sip.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 8093803684..2c45421f50 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1327,7 +1327,6 @@ static int __sip_autodestruct(void *data)
 {
 	struct sip_pvt *p = data;
 
-	p->autokillid = -1;
 
 	/* If this is a subscription, tell the phone that we got a timeout */
 	if (p->subscribed) {
@@ -1337,6 +1336,10 @@ static int __sip_autodestruct(void *data)
 		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) {