automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@73812 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 7e8fdaf01d0e5029b11dc86c70ac854b983e9ea2..29e7c4972301a7ae79c13c7c1c938db9acca0633 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -11301,8 +11301,11 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
                                ast_set_flag(p, SIP_NEEDDESTROY);       
                                return 0;
                        }
-                       if (p->subscribed != NONE)
+                       if (p->subscribed != NONE) {
+                               if (p->stateid > -1)
+                                       ast_extension_state_del(p->stateid, cb_extensionstate);
                                p->stateid = ast_extension_state_add(p->context, p->exten, cb_extensionstate, p);
+                       }
                }
        }