From 821678ac5c38167e2a83c4f08e0f3c4c587b221e Mon Sep 17 00:00:00 2001 From: file Date: Wed, 20 May 2009 17:15:23 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/branches/1.6.0@195637 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_meetme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index c2b310b4f..c4b5a1df2 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -3149,7 +3149,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 { -- cgit v1.2.3