kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 285532 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r285532 | bbryant | 2010-09-08 16:56:12 -0400 (Wed, 08 Sep 2010) | 8 lines
  
  Fixes a bug with MeetMe where after announcing the amount of time left in a conference, if music on hold was playing, it doesn't restart.
  
  (closes issue #17408)
  Reported by: sysreq
  Patches: 
        asterisk-issue-17408_fixed.patch uploaded by sysreq (license 1009)
  Tested by: sysreq
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@285533 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Brett Bryant
2010-09-08 20:58:43 +00:00
parent a766133be6
commit 69e4f34914
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_meetme.c
View File

@@ -2782,6 +2782,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
ast_say_digits(chan, (conf->endtime - now.tv_sec) / 60, "", chan->language); ast_say_digits(chan, (conf->endtime - now.tv_sec) / 60, "", chan->language);
if (!ast_streamfile(chan, "minutes", chan->language)) if (!ast_streamfile(chan, "minutes", chan->language))
ast_waitstream(chan, ""); ast_waitstream(chan, "");
if (musiconhold) {
conf_start_moh(chan, optargs[OPT_ARG_MOH_CLASS]);
}
announcement_played = 1; announcement_played = 1;
} }
} }
@@ -2853,6 +2856,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
res = ast_streamfile(chan, user->warning_sound, chan->language); res = ast_streamfile(chan, user->warning_sound, chan->language);
res = ast_waitstream(chan, ""); res = ast_waitstream(chan, "");
} }
if (musiconhold) {
conf_start_moh(chan, optargs[OPT_ARG_MOH_CLASS]);
}
} }
} }
if (user->warning_freq) { if (user->warning_freq) {