diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-08 22:32:37 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-08 22:32:37 +0000 |
| commit | a8b24b144915b923a671f1d6bda353b4e74064d7 (patch) | |
| tree | 3876fae8c84cc68a605c068e589376444a4d83c7 /apps/app_meetme.c | |
| parent | 68c5ea6ef693bce803138e11623b4637fe0b2236 (diff) | |
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/trunk@147714 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 68c861757..6a832e761 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2172,16 +2172,16 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c extended = 1; } - if (conf->endtime && (now.tv_sec > conf->endtime)) { + if (conf->endtime && (now.tv_sec >= conf->endtime)) { ast_verbose("Quitting time...\n"); 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; |