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: https://origsvn.digium.com/svn/asterisk/trunk@25323 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
BJ Weschke
2006-05-07 13:39:32 +00:00
parent 7e43ace3d8
commit ed46a313d0

View File

@@ -2150,9 +2150,12 @@ static int conf_exec(struct ast_channel *chan, void *data)
break; break;
} else { } else {
/* Pin invalid */ /* Pin invalid */
res = ast_streamfile(chan, "conf-invalidpin", chan->language); if (!ast_streamfile(chan, "conf-invalidpin", chan->language))
if (!res) res = ast_waitstream(chan, AST_DIGIT_ANY);
ast_waitstream(chan, AST_DIGIT_ANY); else {
ast_log(LOG_WARNING, "Couldn't play invalid pin msg!\n");
break;
}
if (res < 0) { if (res < 0) {
AST_LIST_LOCK(&confs); AST_LIST_LOCK(&confs);
cnf->refcount--; cnf->refcount--;