[asterisk-commits] mmichelson: branch 1.6.0 r110637 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Mar 25 10:42:50 2008
New Revision: 110637

URL: http://svn.digium.com/view/asterisk?view=rev&rev=110637
Log:
Merged revisions 110636 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r110636 | mmichelson | 2008-03-25 10:41:33 -0500 (Tue, 25 Mar 2008) | 15 lines

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.


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=110637&r1=110636&r2=110637
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Tue Mar 25 10:42:50 2008
@@ -17203,7 +17203,9 @@
 		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