Merged revisions 182530 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk ........ r182530 | kpfleming | 2009-03-17 09:59:33 -0500 (Tue, 17 Mar 2009) | 2 lines correct logic flaw in ast_answer() changes in r182525 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@182534 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago · fc1ce9bd2c
parent 488a7ced2f
commit fc1ce9bd2c
1 changed files with 2 additions and 1 deletions
--- a/main/channel.c
+++ b/main/channel.c
@ -1837,7 +1837,8 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay, int cdr_answer)

 			if (res == 0) {
 				ast_channel_lock(chan);
-				while ((cur = AST_LIST_REMOVE(&frames, AST_LIST_LAST(&frames), frame_list))) {
+				while ((cur = AST_LIST_LAST(&frames))) {
+					AST_LIST_REMOVE(&frames, cur, frame_list);
 					ast_queue_frame_head(chan, cur);
 					ast_frfree(cur);
 				}