From: Kevin P. Fleming <kpfleming@digium.com>
Date: Tue, 17 Mar 2009 15:00:45 +0000 (+0000)
Subject: Merged revisions 182530 via svnmerge from
X-Git-Tag: 1.6.1.0-rc3~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=860b5570e3447da1f2e6ccceb05cd37ced974f34;p=thirdparty%2Fasterisk.git

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.1@182533 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/channel.c b/main/channel.c
index cb971b1eae..699d495688 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -1812,7 +1812,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);
 				}