Make the 'c' option to MeetMe work even if the 'q' option is used.

(closes issue ASTERISK-17053)
Reported by: justdave

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@354084 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/UPGRADE.txt b/UPGRADE.txt
index a3930f0..6fb9fac 100644 (file)
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -58,6 +58,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
 ===
  - A new option "tonezone" for setting default tonezone for the channel driver

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 52f53d2..3367068 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2617,8 +2617,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
                                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) {