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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@170149 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 3b47f1b86e29687bf478f730717931726c2d2f0c..651a625d0e8f8bd2b507b678203b882c29df1830 100644 (file)
--- 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 &&