[asterisk-commits] dlee: branch dlee/ASTERISK-22451-ari-subscribe r399236 - in /team/dlee/ASTERI...

[SVN commits to the Asterisk project]

Author: dlee
Date: Tue Sep 17 10:45:32 2013
New Revision: 399236

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=399236
Log:
Merged revisions 399225 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    team/dlee/ASTERISK-22451-ari-subscribe/   (props changed)
    team/dlee/ASTERISK-22451-ari-subscribe/apps/confbridge/conf_state_multi_marked.c

Propchange: team/dlee/ASTERISK-22451-ari-subscribe/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Propchange: team/dlee/ASTERISK-22451-ari-subscribe/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep 17 10:45:32 2013
@@ -1,1 +1,1 @@
-/branches/12:1-399222
+/branches/12:1-399235

Modified: team/dlee/ASTERISK-22451-ari-subscribe/apps/confbridge/conf_state_multi_marked.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22451-ari-subscribe/apps/confbridge/conf_state_multi_marked.c?view=diff&rev=399236&r1=399235&r2=399236
==============================================================================
--- team/dlee/ASTERISK-22451-ari-subscribe/apps/confbridge/conf_state_multi_marked.c (original)
+++ team/dlee/ASTERISK-22451-ari-subscribe/apps/confbridge/conf_state_multi_marked.c Tue Sep 17 10:45:32 2013
@@ -93,8 +93,15 @@
 		}
 
 		AST_LIST_TRAVERSE_SAFE_BEGIN(&user->conference->active_list, user_iter, list) {
-			/* Kick ENDMARKED cbu_iters */
+			/* Kick ENDMARKED user_iters */
 			if (ast_test_flag(&user_iter->u_profile, USER_OPT_ENDMARKED)) {
+				if (ast_test_flag(&user_iter->u_profile, USER_OPT_WAITMARKED) &&
+						  !ast_test_flag(&user_iter->u_profile, USER_OPT_MARKEDUSER)) {
+					AST_LIST_REMOVE_CURRENT(list);
+					user_iter->conference->activeusers--;
+					AST_LIST_INSERT_TAIL(&user_iter->conference->waiting_list, user_iter, list);
+					user_iter->conference->waitingusers++;
+				}
 				user_iter->kicked = 1;
 				ast_bridge_remove(user_iter->conference->bridge, user_iter->chan);
 			} else if (ast_test_flag(&user_iter->u_profile, USER_OPT_WAITMARKED) &&