From: Joshua Colp <jcolp@digium.com>
Date: Wed, 20 May 2009 17:16:07 +0000 (+0000)
Subject: Merged revisions 195636 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07290ca6d4f3bc152e302f9bf7e5e0878bc59ff4;p=thirdparty%2Fasterisk.git

Merged revisions 195636 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r195636 | file | 2009-05-20 14:14:42 -0300 (Wed, 20 May 2009) | 12 lines

  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/branches/1.6.1@195638 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index eb8271e29e..a99c3dba9a 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -3206,7 +3206,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 {