Author: mjordan Date: Mon Nov 17 09:27:17 2014 New Revision: 428115 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=428115 Log: apps/app_confbridge: Ensure 'normal' users hear message when last marked leaves
When r428077 was made for ASTERISK-24522, it failed to take into account users who are neither wait_marked nor end_marked. These users are *also* supposed to hear the 'leader has left the conference' message. Granted, this behaviour is a bit odd; however, that is how it used to work... and behaviour changes are not good. This patch ensures that if there are any 'normal' users present when the last marked user leaves the conference, the message will still be played to them. Note that this regression was caught by the Asterisk Test Suite's confbridge_nominal test, which has a quirky combination of users. ........ Merged revisions 428113 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 428114 from http://svn.asterisk.org/svn/asterisk/branches/12 Modified: branches/13/ (props changed) branches/13/apps/confbridge/conf_state_multi_marked.c Propchange: branches/13/ ------------------------------------------------------------------------------ Binary property 'branch-12-merged' - no diff available. Modified: branches/13/apps/confbridge/conf_state_multi_marked.c URL: http://svnview.digium.com/svn/asterisk/branches/13/apps/confbridge/conf_state_multi_marked.c?view=diff&rev=428115&r1=428114&r2=428115 ============================================================================== --- branches/13/apps/confbridge/conf_state_multi_marked.c (original) +++ branches/13/apps/confbridge/conf_state_multi_marked.c Mon Nov 17 09:27:17 2014 @@ -107,6 +107,11 @@ user_iter->conference->activeusers--; AST_LIST_INSERT_TAIL(&user_iter->conference->waiting_list, user_iter, list); user_iter->conference->waitingusers++; + } else { + /* User is neither wait_marked nor end_marked; however, they + * should still hear the prompt. + */ + need_prompt = 1; } } AST_LIST_TRAVERSE_SAFE_END; -- _____________________________________________________________________ -- 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
