Author: sgriepentrog Date: Fri Jan 9 15:45:10 2015 New Revision: 430468 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=430468 Log: app_bridge: return to the next dialplan priority
When app_bridge grabs a channel and puts it into a bridge, the channel should then continue where it left off in the dialplan after the bridge has ended. Although it stores the current dialplan location as an after bridge goto on the channel, it was executing the same priority again instead of going to the next priority. By swapping the "specific" version of bridge_set_after_goto with bridge_set_after_go_on, the next priority in the dialplan is executed instead. ASTERISK-24637 #close Review: https://reviewboard.asterisk.org/r/4322/ Reported by: John Bigelow ........ Merged revisions 430467 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: trunk/ (props changed) trunk/main/features.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/main/features.c URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=430468&r1=430467&r2=430468 ============================================================================== --- trunk/main/features.c (original) +++ trunk/main/features.c Fri Jan 9 15:45:10 2015 @@ -1099,7 +1099,7 @@ extension = ast_strdupa(ast_channel_exten(current_dest_chan)); priority = ast_channel_priority(current_dest_chan); ast_channel_unlock(current_dest_chan); - ast_bridge_set_after_goto(current_dest_chan, context, extension, priority); + ast_bridge_set_after_go_on(current_dest_chan, context, extension, priority, NULL); } if (ast_bridge_features_init(&chan_features)) { -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
