diff options
| author | Joshua Colp <jcolp@digium.com> | 2012-02-06 16:38:23 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2012-02-06 16:38:23 +0000 |
| commit | afdd96712c732387deb8b56368468b4a4759a463 (patch) | |
| tree | 5ac7c226dc08a50aacc4dc82bd8038ab874a290b | |
| parent | 055a19e1286fbb7a3559c9928fad4e7d08af5329 (diff) | |
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
| -rw-r--r-- | UPGRADE.txt | 4 | ||||
| -rw-r--r-- | apps/app_meetme.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/UPGRADE.txt b/UPGRADE.txt index a3930f028..6fb9facc1 100644 --- 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 52f53d2d3..3367068f4 100644 --- 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) { |