diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-28 16:17:36 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-28 16:17:36 +0000 |
commit | ca01ffceeea4930e8bc20f9085dfeb2bb9a18c1d (patch) | |
tree | 97372975bbc1c2f230a85c507f61a52a7bb956a9 /apps/app_meetme.c | |
parent | e59c32a71a06652a9d56fa54e9351b05f52a8c11 (diff) |
Merged revisions 43891 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r43891 | file | 2006-09-28 12:13:55 -0400 (Thu, 28 Sep 2006) | 2 lines
Stop the stream after waitstream returns so that our formats get restored. (issue #7370 reported by kryptolus)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@43893 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
-rw-r--r-- | apps/app_meetme.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index df39581a9..6fe797bbe 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1152,6 +1152,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c if (conf->users == 2) { if (!ast_streamfile(chan,"conf-onlyone",chan->language)) { res = ast_waitstream(chan, AST_DIGIT_ANY); + ast_stopstream(chan); if (res > 0) keepplaying=0; else if (res == -1) @@ -1160,6 +1161,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c } else { if (!ast_streamfile(chan, "conf-thereare", chan->language)) { res = ast_waitstream(chan, AST_DIGIT_ANY); + ast_stopstream(chan); if (res > 0) keepplaying=0; else if (res == -1) @@ -1174,6 +1176,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c } if (keepplaying && !ast_streamfile(chan, "conf-otherinparty", chan->language)) { res = ast_waitstream(chan, AST_DIGIT_ANY); + ast_stopstream(chan); if (res > 0) keepplaying=0; else if (res == -1) @@ -2356,8 +2359,10 @@ static int conf_exec(struct ast_channel *chan, void *data) break; } else { /* Pin invalid */ - if (!ast_streamfile(chan, "conf-invalidpin", chan->language)) + if (!ast_streamfile(chan, "conf-invalidpin", chan->language)) { res = ast_waitstream(chan, AST_DIGIT_ANY); + ast_stopstream(chan); + } else { ast_log(LOG_WARNING, "Couldn't play invalid pin msg!\n"); break; |