[svn-commits] file: trunk r354084 - in /trunk: UPGRADE.txt apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: file
Date: Mon Feb  6 10:38:23 2012
New Revision: 354084

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=354084
Log:
Make the 'c' option to MeetMe work even if the 'q' option is used.

(closes issue ASTERISK-17053)
Reported by: justdave

Modified:
    trunk/UPGRADE.txt
    trunk/apps/app_meetme.c

Modified: trunk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/trunk/UPGRADE.txt?view=diff&rev=354084&r1=354083&r2=354084
==============================================================================
--- trunk/UPGRADE.txt (original)
+++ trunk/UPGRADE.txt Mon Feb  6 10:38:23 2012
@@ -57,6 +57,10 @@
 AMI:
   - DBDelTree now correctly returns an error when 0 rows are deleted just as
     the DBDel action does.
+
+app_meetme:
+  - The 'c' option (announce user count) will now work even if the 'q' (quiet)
+    option is enabled.
 
 SIP
 ===

Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=354084&r1=354083&r2=354084
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Mon Feb  6 10:38:23 2012
@@ -2617,8 +2617,7 @@
 				ast_waitstream(chan, "");
 	}
 
-	if (!ast_test_flag64(confflags, CONFFLAG_QUIET) && ast_test_flag64(confflags, CONFFLAG_ANNOUNCEUSERCOUNT) &&
-		conf->users > 1) {
+	if (ast_test_flag64(confflags, CONFFLAG_ANNOUNCEUSERCOUNT) && conf->users > 1) {
 		int keepplaying = 1;
 
 		if (conf->users == 2) {