From: Igor Goncharovskiy <igor.goncharovsky@gmail.com>
Date: Tue, 2 Jul 2013 10:14:09 +0000 (+0000)
Subject: Fix issue with inability to cancell call transfer made by on-sceen menus.
X-Git-Tag: 11.6.0-rc1~3^2~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ce8896d1521e0dfa15b3056777999e0f8f6d671;p=thirdparty%2Fasterisk.git

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

Reported by: Igor Olhovskiy



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@393395 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index 396000f6ce..f020afd85f 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -3318,12 +3318,11 @@ static void key_call(struct unistimsession *pte, char keycode)
 		}
 		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 @@ static int unistim_hangup(struct ast_channel *ast)
 				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;
 			}
 		}