[svn-commits] tilghman: branch 1.6.1 r201827 - /branches/1.6.1/main/features.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Jun 18 19:35:18 2009
New Revision: 201827

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=201827
Log:
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.1/main/features.c

Modified: branches/1.6.1/main/features.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/features.c?view=diff&rev=201827&r1=201826&r2=201827
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Thu Jun 18 19:35:18 2009
@@ -2758,7 +2758,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) {