From f20ddb1285615b2167271a26c67269bf27b4032c Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Mon, 17 Nov 2014 15:26:50 +0000 Subject: [PATCH] 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. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@428113 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/confbridge/conf_state_multi_marked.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/confbridge/conf_state_multi_marked.c b/apps/confbridge/conf_state_multi_marked.c index 6e3ba3e29a..4f06e3af82 100644 --- a/apps/confbridge/conf_state_multi_marked.c +++ b/apps/confbridge/conf_state_multi_marked.c @@ -105,6 +105,11 @@ static void leave_marked(struct conference_bridge_user *cbu) cbu_iter->conference_bridge->activeusers--; AST_LIST_INSERT_TAIL(&cbu_iter->conference_bridge->waiting_list, cbu_iter, list); cbu_iter->conference_bridge->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;