[svn-commits] file: branch 1.4 r60798 - in /branches/1.4: ./ apps/app_dial.c

[svn-commits at lists.digium.com]

Author: file
Date: Sun Apr  8 20:03:14 2007
New Revision: 60798

URL: http://svn.digium.com/view/asterisk?view=rev&rev=60798
Log:
Merged revisions 60797 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r60797 | file | 2007-04-08 20:59:29 -0400 (Sun, 08 Apr 2007) | 2 lines

When calling a device that then forwards us elsewhere... we have to make our channels compatible if it is the only channel being dialed. (issue #9445 reported by marcelbarbulescu)

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/apps/app_dial.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_dial.c?view=diff&rev=60798&r1=60797&r2=60798
==============================================================================
--- branches/1.4/apps/app_dial.c (original)
+++ branches/1.4/apps/app_dial.c Sun Apr  8 20:03:14 2007
@@ -492,11 +492,12 @@
 						cause = AST_CAUSE_BUSY;
 					} else {
 						/* Setup parameters */
-						c = o->chan = ast_request(tech, in->nativeformats, stuff, &cause);
-						if (!c)
+						if ((c = o->chan = ast_request(tech, in->nativeformats, stuff, &cause))) {
+							if (single)
+								ast_channel_make_compatible(o->chan, in);
+							ast_channel_inherit_variables(in, o->chan);
+						} else
 							ast_log(LOG_NOTICE, "Unable to create local channel for call forward to '%s/%s' (cause = %d)\n", tech, stuff, cause);
-						else
-							ast_channel_inherit_variables(in, o->chan);
 					}
 				} else {
 					if (option_verbose > 2)