automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@8581 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 4 insertions, 0 deletions

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index d591abd99..c219d61b2 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -4200,6 +4200,10 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
                                      (ast->_state == AST_STATE_RINGING))) {
                                         ast_log(LOG_DEBUG, "Answering on polarity switch!\n");
                                         ast_setstate(p->owner, AST_STATE_UP);
+					if(p->hanguponpolarityswitch) {
+						gettimeofday(&p->polaritydelaytv, NULL);
+					}
+					break;
                                 } else
                                         ast_log(LOG_DEBUG, "Ignore switch to REVERSED Polarity on channel %d, state %d\n", p->channel, ast->_state);
 			}