diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-17 15:00:45 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-17 15:00:45 +0000 |
| commit | 1c6243cf61ec6ac26774af840090910f57667592 (patch) | |
| tree | 0a22134b39652e40c1312c5da70358a9aafb5ccc /main | |
| parent | f769a917e5b68ed2b1268815b1d1405418a346dc (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@182533 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index cb971b1ea..699d49568 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); } |