diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-22 16:53:12 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-22 16:53:12 +0000 |
| commit | 3972f0843ee9997ec6f6f701852b3a6190058cf2 (patch) | |
| tree | 165f7907682e40b216f74491ed5a5a70f620cdb6 | |
| parent | 1d8ce32a7793ee73ff28493417ffd04a51ea3c54 (diff) | |
Merged revisions 170148 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r170148 | file | 2009-01-22 12:52:21 -0400 (Thu, 22 Jan 2009) | 11 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@170149 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 3b47f1b86..651a625d0 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2946,9 +2946,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 && @@ -3044,9 +3044,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 && |