[svn-commits] tilghman: branch 1.6.0 r201830 - in /branches/1.6.0: ./ main/features.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Jun 18 19:44:18 2009
New Revision: 201830

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=201830
Log:
Merged revisions 201829 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r201829 | tilghman | 2009-06-18 19:43:41 -0500 (Thu, 18 Jun 2009) | 13 lines
  
  Merged revisions 201828 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r201828 | tilghman | 2009-06-18 19:40:41 -0500 (Thu, 18 Jun 2009) | 6 lines
    
    If the "h" extension fails, give it another chance in main/pbx.c.
    If the "h" extension fails, give it another chance in main/pbx.c, when it
    returns from the bridge code.  Fixes an issue where the "h" extension may
    occasionally not fire, when a Dial is executed from a Macro.
    Debugged in #asterisk with user tompaw.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/features.c

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

Modified: branches/1.6.0/main/features.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/main/features.c?view=diff&rev=201830&r1=201829&r2=201830
==============================================================================
--- branches/1.6.0/main/features.c (original)
+++ branches/1.6.0/main/features.c Thu Jun 18 19:44:18 2009
@@ -2554,7 +2554,9 @@
 				bridge_cdr = NULL;
 			}
 		}
-		ast_set_flag(chan, AST_FLAG_BRIDGE_HANGUP_RUN);
+		if (chan->priority != 1 || !spawn_error) {
+			ast_set_flag(chan, AST_FLAG_BRIDGE_HANGUP_RUN);
+		}
 		ast_channel_unlock(chan);
 		/* protect the lastapp/lastdata against the effects of the hangup/dialplan code */
 		if (bridge_cdr) {