[svn-commits] file: trunk r195636 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed May 20 12:14:42 2009
New Revision: 195636

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=195636
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=195636&r1=195635&r2=195636
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Wed May 20 12:14:42 2009
@@ -3697,7 +3697,7 @@
 
 		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 {