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 cb971b1eae319786264e116627443fb40be5f0e6..699d49568847c83f72e6ed584258b17665df730a 100644 (file)
--- 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);
                                }