From 07290ca6d4f3bc152e302f9bf7e5e0878bc59ff4 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Wed, 20 May 2009 17:16:07 +0000 Subject: [PATCH] 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 --- apps/app_meetme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { -- 2.47.2