[svn-commits] file: branch 1.6.0 r195637 - in /branches/1.6.0: ./ apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed May 20 12:15:23 2009
New Revision: 195637

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_meetme.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_meetme.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/apps/app_meetme.c?view=diff&rev=195637&r1=195636&r2=195637
==============================================================================
--- branches/1.6.0/apps/app_meetme.c (original)
+++ branches/1.6.0/apps/app_meetme.c Wed May 20 12:15:23 2009
@@ -3149,7 +3149,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 {