[asterisk-commits] nadi: branch group/trunk-cm-csel-hash r47411 - /team/group/trunk-cm-csel-hash...

[asterisk-commits at lists.digium.com]

Author: nadi
Date: Fri Nov 10 02:29:25 2006
New Revision: 47411

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47411
Log:
mod for holded channels

Modified:
    team/group/trunk-cm-csel-hash/channels/chan_misdn.c

Modified: team/group/trunk-cm-csel-hash/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/channels/chan_misdn.c?view=diff&rev=47411&r1=47410&r2=47411
==============================================================================
--- team/group/trunk-cm-csel-hash/channels/chan_misdn.c (original)
+++ team/group/trunk-cm-csel-hash/channels/chan_misdn.c Fri Nov 10 02:29:25 2006
@@ -3726,7 +3726,7 @@
 	chan_misdn_log(3, bc->port, " --> org:%d nt:%d, inbandavail:%d state:%d\n",
 				   ch->orginator, bc->nt, misdn_inband_avail(bc), state);
 	
-	if (ch->orginator == ORG_AST && !bc->nt && misdn_inband_avail(bc)) {
+	if (ch->orginator == ORG_AST && !bc->nt && misdn_inband_avail(bc) && state != MISDN_CONNECTED) {
 		/* If there's inband information available (e.g. a recorded message saying what was wrong with the
 		 * dialled number, or perhaps even giving an alternative number, then play it instead of
 		 * immediately releasing the call */
@@ -3736,7 +3736,7 @@
 	}
 	/* Check for holded channel, to implement transfer */
 	holded_ch = find_holded(cl_te, bc);
-	if (holded_ch && holded_ch != ch && ch->ast && state_machine_get_state(holded_ch->sm) == MISDN_CONNECTED) {
+	if (holded_ch && holded_ch != ch && ch->ast && state == MISDN_CONNECTED) {
 		chan_misdn_log(2, bc->port, " --> found holded ch\n");
 		misdn_transfer_bc(ch, holded_ch) ;
 	}