[svn-commits] rmudgett: branch 11 r371862 - in /branches/11: ./ apps/app_dial.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Aug 29 13:32:35 2012
New Revision: 371862

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=371862
Log:
Fix hangup cause passthrough regression.

The v1.8 -r369258 change to fix the F and F(x) action logic introduced a
regression in passing the hangup cause from the called channel to the
caller channel.

(closes issue ASTERISK-20287)
Reported by: Konstantin Suvorov
Patches:
      app_dial_hangupcause.patch (license #6421) patch uploaded by Konstantin Suvorov (modified)
Tested by: rmudgett
........

Merged revisions 371860 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 371861 from http://svn.asterisk.org/svn/asterisk/branches/10

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

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: branches/11/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/apps/app_dial.c?view=diff&rev=371862&r1=371861&r2=371862
==============================================================================
--- branches/11/apps/app_dial.c (original)
+++ branches/11/apps/app_dial.c Wed Aug 29 13:32:35 2012
@@ -3065,9 +3065,9 @@
 					/* The peer is now running its own PBX. */
 					goto out;
 				}
-			} else {
-				ast_channel_hangupcause_set(chan, ast_channel_hangupcause(peer));
-			}
+			}
+		} else if (!ast_check_hangup(chan)) {
+			ast_channel_hangupcause_set(chan, ast_channel_hangupcause(peer));
 		}
 		ast_autoservice_chan_hangup_peer(chan, peer);
 	}