[svn-commits] igorg: branch 11 r393395 - /branches/11/channels/chan_unistim.c

[SVN commits to the Digium repositories]

Author: igorg
Date: Tue Jul  2 05:14:09 2013
New Revision: 393395

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=393395
Log:

Fix issue with inability to cancell call transfer made by on-sceen menus.

Reported by: Igor Olhovskiy


Modified:
    branches/11/channels/chan_unistim.c

Modified: branches/11/channels/chan_unistim.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/channels/chan_unistim.c?view=diff&rev=393395&r1=393394&r2=393395
==============================================================================
--- branches/11/channels/chan_unistim.c (original)
+++ branches/11/channels/chan_unistim.c Tue Jul  2 05:14:09 2013
@@ -3318,12 +3318,11 @@
 		}
 		break;
 	case KEY_FUNC2:
+		if (ast_channel_state(sub->owner) == AST_STATE_RING) {
+			transfer_cancel_step2(pte);
+		}
 		if (ast_channel_state(sub->owner) == AST_STATE_UP) {
-			if (get_sub(pte->device, SUB_THREEWAY)) {
-				transfer_cancel_step2(pte);
-			} else {
-				transfer_call_step1(pte);
-			}
+			transfer_call_step1(pte);
 		}
 		break;
 	case KEY_HANGUP:
@@ -4837,7 +4836,6 @@
 				continue;
 			}
 			if (d->ssub[i] != NULL) { /* Found other subchannel active other then hangup'ed one */
-				ast_log(LOG_WARNING, "There is not only one call here %p %p %i\n",d->ssub[i], sub, i);
 				end_call = 0;
 			}
 		}