[svn-commits] seanbright: branch 1.8 r316476 - in /branches/1.8: ./ apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Tue May  3 21:34:01 2011
New Revision: 316476

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=316476
Log:
Merged revisions 316475 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r316475 | seanbright | 2011-05-03 22:23:01 -0400 (Tue, 03 May 2011) | 10 lines
  
  Honor the C option to MeetMe when L is passed.
  
  This fixes a case that r304773 and friends missed.
  
  (closes issue #17317)
  Reported by: var
  Patches:
        meetme-continue-on-l_16218.diff uploaded by var (license 1227)
  Tested by: seanbright
........

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

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_meetme.c?view=diff&rev=316476&r1=316475&r2=316476
==============================================================================
--- branches/1.8/apps/app_meetme.c (original)
+++ branches/1.8/apps/app_meetme.c Tue May  3 21:34:01 2011
@@ -2843,6 +2843,11 @@
  						res = ast_streamfile(chan, user->end_sound, chan->language);
  						res = ast_waitstream(chan, "");
  					}
+					if (ast_test_flag64(confflags, CONFFLAG_KICK_CONTINUE)) {
+						ret = 0;
+					} else {
+						ret = -1;
+					}
  					break;
  				}