kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 16:50:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@10017 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-02-14 20:11:19 +00:00
parent 13d5513465
commit 3a0ec4568d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/app_meetme.c
View File

@@ -1351,9 +1351,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
if (!menu_active) {
menu_active = 1;
/* Record this sound! */
if (!ast_streamfile(chan, "conf-adminmenu", chan->language))
if (!ast_streamfile(chan, "conf-adminmenu", chan->language)) {
dtmf = ast_waitstream(chan, AST_DIGIT_ANY);
else
ast_stopstream(chan);
} else
dtmf = 0;
} else
dtmf = f->subclass;
@@ -1430,9 +1431,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
/* User menu */
if (!menu_active) {
menu_active = 1;
if (!ast_streamfile(chan, "conf-usermenu", chan->language))
if (!ast_streamfile(chan, "conf-usermenu", chan->language)) {
dtmf = ast_waitstream(chan, AST_DIGIT_ANY);
else
ast_stopstream(chan);
} else
dtmf = 0;
} else
dtmf = f->subclass;