From c8d4a9a6717da971cba23a1b2bf3a5a87f179bf2 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Sun, 13 Jan 2019 01:30:23 +0100 Subject: [PATCH 1/2] Set focus to textbox instead of connecting, fixes #1271 --- mRemoteV1/UI/Controls/QuickConnectToolStrip.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mRemoteV1/UI/Controls/QuickConnectToolStrip.cs b/mRemoteV1/UI/Controls/QuickConnectToolStrip.cs index c1eab8e1..a028a4dd 100644 --- a/mRemoteV1/UI/Controls/QuickConnectToolStrip.cs +++ b/mRemoteV1/UI/Controls/QuickConnectToolStrip.cs @@ -203,7 +203,7 @@ namespace mRemoteNG.UI.Controls private void btnQuickConnect_DropDownItemClicked(object sender, ToolStripItemClickedEventArgs e) { SetQuickConnectProtocol(e.ClickedItem.Text); - btnQuickConnect_ButtonClick(this, e); + _cmbQuickConnect.Focus(); } private void SetQuickConnectProtocol(string protocol) From 7ec677f021d4eb52e33e9e746142d50256608098 Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Fri, 8 Feb 2019 17:20:30 -0500 Subject: [PATCH 2/2] conditinally focus --- mRemoteV1/UI/Controls/QuickConnectToolStrip.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mRemoteV1/UI/Controls/QuickConnectToolStrip.cs b/mRemoteV1/UI/Controls/QuickConnectToolStrip.cs index a028a4dd..06d93584 100644 --- a/mRemoteV1/UI/Controls/QuickConnectToolStrip.cs +++ b/mRemoteV1/UI/Controls/QuickConnectToolStrip.cs @@ -203,7 +203,10 @@ namespace mRemoteNG.UI.Controls private void btnQuickConnect_DropDownItemClicked(object sender, ToolStripItemClickedEventArgs e) { SetQuickConnectProtocol(e.ClickedItem.Text); - _cmbQuickConnect.Focus(); + if (string.IsNullOrEmpty(_cmbQuickConnect.Text)) + _cmbQuickConnect.Focus(); + else + btnQuickConnect_ButtonClick(this, e); } private void SetQuickConnectProtocol(string protocol)