[asterisk-commits] seanbright: branch 1.6.2 r316475 - /branches/1.6.2/apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Tue May  3 21:23:01 2011
New Revision: 316475

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=316475
Log:
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.6.2/apps/app_meetme.c

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