Merged revisions 127157 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r127157 | mmichelson | 2008-07-01 16:16:00 -0500 (Tue, 01 Jul 2008) | 8 lines

Place the delay in __ast_answer prior to the channel-specific answer
callback. This change differs from commit 127113 in that now the 
channel is not set to AST_STATE_UP until after the answer callback.

(closes issue #12924)
Reported by: snyfer


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@127158 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/channel.c

@@ -1682,7 +1682,6 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay)
 		if (delay) {
 			int needanswer = (chan->tech->answer != NULL);
 
-			ast_setstate(chan, AST_STATE_UP);
 			ast_cdr_answer(chan->cdr);
 			ast_channel_unlock(chan);
 			ast_safe_sleep(chan, delay);
@@ -1695,6 +1694,7 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay)
 				res = chan->tech->answer(chan);
 				ast_channel_unlock(chan);
 			}
+			ast_setstate(chan, AST_STATE_UP);	
 		} else {
 			if (chan->tech->answer) {
 				res = chan->tech->answer(chan);