Merged revisions 170147 via svnmerge from
[asterisk/asterisk.git] / apps / app_meetme.c
index f4ed6a8..5a3783f 100644 (file)
@@ -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 &&