[svn-commits] oej: trunk r66433 - in /trunk: ./ channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: oej
Date: Tue May 29 11:19:53 2007
New Revision: 66433

URL: http://svn.digium.com/view/asterisk?view=rev&rev=66433
Log:
Merged revisions 66414 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r66414 | oej | 2007-05-29 18:07:44 +0200 (Tue, 29 May 2007) | 2 lines

Don't reset hangupcause if we already have one

........

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=66433&r1=66432&r2=66433
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue May 29 11:19:53 2007
@@ -2096,7 +2096,7 @@
 			usleep(1);
 			sip_pvt_lock(pkt->owner);
 		}
-		if (pkt->owner->owner) 
+		if (pkt->owner->owner && !pkt->owner->owner->hangupcause) 
 			pkt->owner->owner->hangupcause = AST_CAUSE_NO_USER_RESPONSE;
 		if (pkt->method == SIP_BYE) {
 			/* Ok, we're not getting answers on SIP BYE's. Who cares?