If we are unable to request a DAHDI pseudo channel and we are using the user introduc...

(closes issue #14282)
Reported by: cheesegrits

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 2503b0f380e4761598c89f81984a49ba6e6c534c..a750728344616a4f167b610c7eeb1b0f2be7c8f2 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2508,9 +2508,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 %s channel available for conference, user introduction disabled\n", dahdi_chan_name);
-                       ast_clear_flag(confflags, CONFFLAG_INTROUSER);
+                       ast_clear_flag(confflags, CONFFLAG_INTROUSER | CONFFLAG_INTROUSERNOREVIEW);
                }
                
                if (confflags && !cnf->chan &&
@@ -2602,9 +2602,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 %s channel available for conference, user introduction disabled\n", dahdi_chan_name);
-                       ast_clear_flag(confflags, CONFFLAG_INTROUSER);
+                       ast_clear_flag(confflags, CONFFLAG_INTROUSER | CONFFLAG_INTROUSERNOREVIEW);
                }
                
                if (confflags && !cnf->chan &&