[svn-commits] tilghman: trunk r201829 - in /trunk: ./ main/features.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Jun 18 19:43:41 2009
New Revision: 201829

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=201829
Log:
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:
    trunk/   (props changed)
    trunk/main/features.c

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

Modified: trunk/main/features.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/features.c?view=diff&rev=201829&r1=201828&r2=201829
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Thu Jun 18 19:43:41 2009
@@ -2952,7 +2952,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) {