diff options
| author | Joshua Colp <jcolp@digium.com> | 2009-01-22 16:52:21 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2009-01-22 16:52:21 +0000 |
| commit | f6f5197e635263ed15f112bb7d6c65b57dd00bd6 (patch) | |
| tree | b408595d327dab80d534c598298adc8b611270a2 /apps | |
| parent | 9a28a07739861586566e5ed4a078aa7bcb642095 (diff) | |
Merged revisions 170147 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r170147 | file | 2009-01-22 12:50:54 -0400 (Thu, 22 Jan 2009) | 4 lines
If we are unable to request a DAHDI pseudo channel and we are using the user introduction without review option make sure it gets unset so other code does not blindly assume a DAHDI pseudo channel exists.
(closes issue #14282)
Reported by: cheesegrits
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@170148 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_meetme.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index f4ed6a87c..5a3783f2e 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -3455,9 +3455,9 @@ static struct ast_conference *find_conf_realtime(struct ast_channel *chan, char if (cnf) { if (confflags && !cnf->chan && !ast_test_flag(confflags, CONFFLAG_QUIET) && - ast_test_flag(confflags, CONFFLAG_INTROUSER)) { + ast_test_flag(confflags, CONFFLAG_INTROUSER | CONFFLAG_INTROUSERNOREVIEW)) { ast_log(LOG_WARNING, "No DAHDI channel available for conference, user introduction disabled (is chan_dahdi loaded?)\n"); - ast_clear_flag(confflags, CONFFLAG_INTROUSER); + ast_clear_flag(confflags, CONFFLAG_INTROUSER | CONFFLAG_INTROUSERNOREVIEW); } if (confflags && !cnf->chan && @@ -3557,9 +3557,9 @@ static struct ast_conference *find_conf(struct ast_channel *chan, char *confno, if (cnf) { if (confflags && !cnf->chan && !ast_test_flag(confflags, CONFFLAG_QUIET) && - ast_test_flag(confflags, CONFFLAG_INTROUSER)) { + ast_test_flag(confflags, CONFFLAG_INTROUSER | CONFFLAG_INTROUSERNOREVIEW)) { ast_log(LOG_WARNING, "No DAHDI channel available for conference, user introduction disabled (is chan_dahdi loaded?)\n"); - ast_clear_flag(confflags, CONFFLAG_INTROUSER); + ast_clear_flag(confflags, CONFFLAG_INTROUSER | CONFFLAG_INTROUSERNOREVIEW); } if (confflags && !cnf->chan && |