From: Sean Bright <sean@malleable.com>
Date: Wed, 4 May 2011 02:23:01 +0000 (+0000)
Subject: Honor the C option to MeetMe when L is passed.
X-Git-Tag: 1.6.2.19-rc1~3^2~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e2ce928a59495b046d2e3b25296b732afa49399;p=thirdparty%2Fasterisk.git

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.6.2@316475 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index c1111d40fa..c803aae341 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2683,6 +2683,11 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
  						res = ast_streamfile(chan, user->end_sound, chan->language);
  						res = ast_waitstream(chan, "");
  					}
+					if (confflags & CONFFLAG_KICK_CONTINUE) {
+						ret = 0;
+					} else {
+						ret = -1;
+					}
  					break;
  				}