[svn-commits] mmichelson: trunk r110636 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Mar 25 10:41:33 2008
New Revision: 110636

URL: http://svn.digium.com/view/asterisk?view=rev&rev=110636
Log:
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:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=110636&r1=110635&r2=110636
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Mar 25 10:41:33 2008
@@ -17288,7 +17288,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