mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-20 12:20:12 +00:00
Fix stopstream in menus (bug #6137)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@9990 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1351,9 +1351,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
|
|||||||
if (!menu_active) {
|
if (!menu_active) {
|
||||||
menu_active = 1;
|
menu_active = 1;
|
||||||
/* Record this sound! */
|
/* 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);
|
dtmf = ast_waitstream(chan, AST_DIGIT_ANY);
|
||||||
else
|
ast_stopstream(chan);
|
||||||
|
} else
|
||||||
dtmf = 0;
|
dtmf = 0;
|
||||||
} else
|
} else
|
||||||
dtmf = f->subclass;
|
dtmf = f->subclass;
|
||||||
@@ -1430,9 +1431,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
|
|||||||
/* User menu */
|
/* User menu */
|
||||||
if (!menu_active) {
|
if (!menu_active) {
|
||||||
menu_active = 1;
|
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);
|
dtmf = ast_waitstream(chan, AST_DIGIT_ANY);
|
||||||
else
|
ast_stopstream(chan);
|
||||||
|
} else
|
||||||
dtmf = 0;
|
dtmf = 0;
|
||||||
} else
|
} else
|
||||||
dtmf = f->subclass;
|
dtmf = f->subclass;
|
||||||
|
Reference in New Issue
Block a user