aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2006-02-14 19:11:25 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2006-02-14 19:11:25 +0000
commit5829daa1259d1b4edfca8699f994895d22532355 (patch)
tree16542ab79812e35317ada4066725fed8041f80bc
parent437dcd93b6a0cf74248d789d4e369dbaa3cd2667 (diff)
Fix stopstream in menus (bug #6137)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@9990 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_meetme.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index f541758d8..63b6691fa 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -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;