From: Sean Bright <sean@malleable.com>
Date: Wed, 4 May 2011 02:34:01 +0000 (+0000)
Subject: Merged revisions 316475 via svnmerge from
X-Git-Tag: 1.8.5-rc1~11^2~176
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa43b12c2482e5d4591bd98b5018f240d62d224a;p=thirdparty%2Fasterisk.git

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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@316476 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 81edfc0f7b..92d8d9944a 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2843,6 +2843,11 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
  						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;
  				}