diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-08 22:33:43 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-08 22:33:43 +0000 |
| commit | 51619435a4ed586a1d35d60acdfee494112c59d2 (patch) | |
| tree | 5f77715797c9dbd9c7ef568bccf972f6b6df2ba7 /apps/app_meetme.c | |
| parent | be518614e5462c8167305f5f17f1b37382ae4a87 (diff) | |
Merged revisions 147714 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r147714 | mmichelson | 2008-10-08 17:32:37 -0500 (Wed, 08 Oct 2008) | 8 lines
Some small tweaks regarding realtime conference announcements.
(closes issue #13522)
Reported by: DEA
Patches:
meetme-rt-fixes.txt uploaded by DEA (license 3)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@147719 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 823b74efc..4a14c3dcb 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2031,16 +2031,15 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c if (rt_schedule) { if (now.tv_sec % 60 == 0) { if (!checked) { - if (now.tv_sec > conf->endtime) { - ast_verbose("Quitting time...\n"); + if (now.tv_sec >= conf->endtime) { goto outrun; } if (!announcement_played && conf->endalert) { - if (now.tv_sec + conf->endalert > conf->endtime) { + if (now.tv_sec + conf->endalert >= conf->endtime) { if (!ast_streamfile(chan, "conf-will-end-in", chan->language)) ast_waitstream(chan, ""); - ast_say_digits(chan, (now.tv_sec + conf->endalert - conf->endtime) / 60, "", chan->language); + ast_say_digits(chan, (conf->endtime - now.tv_sec) / 60, "", chan->language); if (!ast_streamfile(chan, "minutes", chan->language)) ast_waitstream(chan, ""); announcement_played = 1; |