From: Joshua Colp <jcolp@digium.com>
Date: Sat, 16 Jan 2016 14:29:58 +0000 (-0600)
Subject: Merge "bridge_basic: don't play an attended transfer fail sound after target hangs up"
X-Git-Tag: 14.0.0-beta1~460
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34dbed961969377eb0e9daac43a2b23ab46e3db5;p=thirdparty%2Fasterisk.git

Merge "bridge_basic: don't play an attended transfer fail sound after target hangs up"
---

34dbed961969377eb0e9daac43a2b23ab46e3db5
diff --cc main/bridge_basic.c
index 5d8ee49d06,47d838fcae..8d7fbae709
--- a/main/bridge_basic.c
+++ b/main/bridge_basic.c
@@@ -2222,8 -2178,9 +2222,9 @@@ static enum attended_transfer_state con
  		bridge_unhold(props->transferee_bridge);
  		return TRANSFER_COMPLETE;
  	case STIMULUS_TRANSFER_TARGET_HANGUP:
+ 		return TRANSFER_REBRIDGE;
  	case STIMULUS_DTMF_ATXFER_ABORT:
 -		play_sound(props->transferer, props->failsound);
 +		play_failsound(props->transferer);
  		return TRANSFER_REBRIDGE;
  	case STIMULUS_DTMF_ATXFER_THREEWAY:
  		bridge_unhold(props->transferee_bridge);