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 81edfc0f7b855f645a07f9f5b5ad0e54217a257f..92d8d9944aeac792c4df6c91d0572ef6bf40016a 100644 (file)
--- 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;
                                }