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 c1111d40fa3856467c4a5318104d1380aee9acd7..c803aae34181765665c6923f5a2d3f07775c956a 100644 (file)
--- 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;
                                }