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.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201830 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/features.c

@@ -2554,7 +2554,9 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
 				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) {