diff options
| author | bweschke <bweschke@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-07 13:39:32 +0000 |
|---|---|---|
| committer | bweschke <bweschke@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-07 13:39:32 +0000 |
| commit | 623bf01f9a9eb3808803b7b309c8bf1c405a8c4a (patch) | |
| tree | 51bfb520bb31f1e969755c4b579770e0835bba46 /apps/app_meetme.c | |
| parent | 7c748cc9c7d3145aa05455d2bacc47e07a22b951 (diff) | |
Merged revisions 25322 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r25322 | bweschke | 2006-05-07 09:38:11 -0400 (Sun, 07 May 2006) | 3 lines
Fix playback behavior to exit correctly when we receive a hangup during playback of the invalid pin message. #7091 (AntD reporting)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@25323 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 44b1e2c5c..b3dcfca4c 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2150,9 +2150,12 @@ static int conf_exec(struct ast_channel *chan, void *data) break; } else { /* Pin invalid */ - res = ast_streamfile(chan, "conf-invalidpin", chan->language); - if (!res) - ast_waitstream(chan, AST_DIGIT_ANY); + if (!ast_streamfile(chan, "conf-invalidpin", chan->language)) + res = ast_waitstream(chan, AST_DIGIT_ANY); + else { + ast_log(LOG_WARNING, "Couldn't play invalid pin msg!\n"); + break; + } if (res < 0) { AST_LIST_LOCK(&confs); cnf->refcount--; |