diff options
| author | Sean Bright <sean@malleable.com> | 2011-05-04 02:39:11 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2011-05-04 02:39:11 +0000 |
| commit | c596329564576edae921931b58e72613aab68844 (patch) | |
| tree | ea5f31c8295d31fe3ed6b4b9c8c12ac1cfce1873 /apps/app_meetme.c | |
| parent | fbe3c85deef84bcc46494873bc160e1d17b156be (diff) | |
Merged revisions 316476 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r316476 | seanbright | 2011-05-03 22:34:01 -0400 (Tue, 03 May 2011) | 17 lines
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/trunk@316477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index e2e77f0e0..b9f0dbbff 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2918,6 +2918,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; } |