[asterisk-commits] file: trunk r60799 - in /trunk: ./ apps/app_dial.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Sun Apr  8 20:06:56 2007
New Revision: 60799

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

................
r60798 | file | 2007-04-08 21:03:14 -0400 (Sun, 08 Apr 2007) | 10 lines

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:
    trunk/   (props changed)
    trunk/apps/app_dial.c

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

Modified: trunk/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_dial.c?view=diff&rev=60799&r1=60798&r2=60799
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Sun Apr  8 20:06:56 2007
@@ -459,10 +459,12 @@
 		} else {
 			/* Setup parameters */
 			c = o->chan = ast_request(tech, in->nativeformats, stuff, &cause);
-			if (!c)
+			if (c) {
+				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)