diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-14 20:11:19 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-14 20:11:19 +0000 |
| commit | ae3b6202de1dcac251f5d7b84d6a917763efbb9e (patch) | |
| tree | c33ab2efed28faa246ca21a1d34222b188a048d8 /apps/app_meetme.c | |
| parent | 6583688474069059d629a1670deef5e5fff0a68d (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@10017 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 10 |
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; |