Merged revisions 195635 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r195635 | file | 2009-05-20 14:14:00 -0300 (Wed, 20 May 2009) | 5 lines

  Fix a bug where the MeetMe option 'D' did not actually prompt for the pin.

  (closes issue #15050)
  Reported by: pmhaddad
........

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 9b5b6d7..09858c1 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -3697,7 +3697,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
 
                empty = ast_test_flag(&confflags, CONFFLAG_EMPTY | CONFFLAG_EMPTYNOPIN);
                empty_no_pin = ast_test_flag(&confflags, CONFFLAG_EMPTYNOPIN);
-               always_prompt = ast_test_flag(&confflags, CONFFLAG_ALWAYSPROMPT);
+               always_prompt = ast_test_flag(&confflags, CONFFLAG_ALWAYSPROMPT | CONFFLAG_DYNAMICPIN);
        }
 
        do {