summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2008-03-25 15:41:33 +0000
committerMark Michelson <mmichelson@digium.com>2008-03-25 15:41:33 +0000
commit67efba6e50619a487656700b6bd481289b54c6bb (patch)
tree74d3368e3ae5f1b2da0ec249655f3a1f00cedf5d /channels
parent738e4ec94e7144147b21c158764dc7d8fbbc20bf (diff)
Merged revisions 110635 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r110635 | mmichelson | 2008-03-25 10:40:33 -0500 (Tue, 25 Mar 2008) | 7 lines When reverting a commit, I accidentally left in this bit which was an experiment to see what would happen. It passed the compile test, and I didn't notice I had left this change in too. So this is a revert of a revert...sort of. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110636 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 128175234..ba8fbd9b2 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -17288,7 +17288,9 @@ static int handle_request_cancel(struct sip_pvt *p, struct sip_request *req)
update_call_counter(p, DEC_CALL_LIMIT);
stop_media_flows(p); /* Immediately stop RTP, VRTP and UDPTL as applicable */
-
+ if (p->owner)
+ ast_queue_hangup(p->owner);
+ else
if (p->owner)
ast_queue_hangup(p->owner);
else