From: Joshua Colp <jcolp@digium.com>
Date: Thu, 7 Jun 2007 14:19:40 +0000 (+0000)
Subject: Allow the 'g' option to work if used with the 'S' option. (issue #9888 reported by... 
X-Git-Tag: 1.2.19~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c0627eab09939e89f7b59db2236818c86b734a1;p=thirdparty%2Fasterisk.git

Allow the 'g' option to work if used with the 'S' option. (issue #9888 reported by gasparz)


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

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 074226e0d2..ccd6489c87 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1660,8 +1660,11 @@ out:
 	pbx_builtin_setvar_helper(chan, "DIALSTATUS", status);
 	ast_log(LOG_DEBUG, "Exiting with DIALSTATUS=%s.\n", status);
 	
-	if ((ast_test_flag(peerflags, OPT_GO_ON)) && (!chan->_softhangup) && (res != AST_PBX_KEEPALIVE))
+	if ((ast_test_flag(peerflags, OPT_GO_ON)) && (!chan->_softhangup) && (res != AST_PBX_KEEPALIVE)) {
+		if (calldurationlimit)
+			chan->whentohangup = 0;
 		res=0;
+	}
 	
 	LOCAL_USER_REMOVE(u);