diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-20 17:16:07 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-20 17:16:07 +0000 |
| commit | 623ea81aa8f6a0413a0fbadf551de6bc0d0f7d5f (patch) | |
| tree | 405060dff402dc6865bef53ba202b04feac5d971 /apps/app_meetme.c | |
| parent | 0aef41ec2a6d56165b01a60ef5e4c139aad6b9dd (diff) | |
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.1@195638 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index eb8271e29..a99c3dba9 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 { |