[asterisk-commits] kpfleming: branch 1.6.2 r182534 - in /branches/1.6.2: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Tue Mar 17 10:01:02 2009
New Revision: 182534

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=182534
Log:
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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/channel.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Tue Mar 17 10:01:02 2009
@@ -1,1 +1,1 @@
-/trunk:1-182359,182408,182450,182525
+/trunk:1-182359,182408,182450,182525,182530

Modified: branches/1.6.2/main/channel.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/main/channel.c?view=diff&rev=182534&r1=182533&r2=182534
==============================================================================
--- branches/1.6.2/main/channel.c (original)
+++ branches/1.6.2/main/channel.c Tue Mar 17 10:01:02 2009
@@ -1837,7 +1837,8 @@
 
 			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);
 				}