[svn-commits] jpeeler: branch jpeeler/asterisk-sigwork-trunk r206457 - in /team/jpeeler/ast...

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Tue Jul 14 11:13:59 2009
New Revision: 206457

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=206457
Log:
sync with trunk

Modified:
    team/jpeeler/asterisk-sigwork-trunk/   (props changed)
    team/jpeeler/asterisk-sigwork-trunk/apps/app_dial.c

Propchange: team/jpeeler/asterisk-sigwork-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul 14 11:13:59 2009
@@ -1,1 +1,1 @@
-/trunk:1-206405
+/trunk:1-206456

Modified: team/jpeeler/asterisk-sigwork-trunk/apps/app_dial.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/apps/app_dial.c?view=diff&rev=206457&r1=206456&r2=206457
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/apps/app_dial.c (original)
+++ team/jpeeler/asterisk-sigwork-trunk/apps/app_dial.c Tue Jul 14 11:13:59 2009
@@ -972,6 +972,7 @@
 				continue;
 			/* here, o->chan == c == winner */
 			if (!ast_strlen_zero(c->call_forward)) {
+				(*sentringing) = 0;
 				do_forward(o, &num, peerflags, single, to);
 				continue;
 			}
@@ -1097,6 +1098,7 @@
 					} else {
 						ast_verb(3, "%s redirecting info has changed, passing it to %s\n", c->name, in->name);
 						ast_indicate_data(in, AST_CONTROL_REDIRECTING, f->data.ptr, f->datalen);
+						(*sentringing) = 0;
 					}
 					break;
 				case AST_CONTROL_PROCEEDING: