Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix issue MR-332 - Can't select different tab with one click after di…

…sconnecting existing tab
  • Loading branch information...
commit 73f71050a0aad4075572e5efb923a79c1525e301 1 parent 94d901e
@rmcardle authored
Showing with 10 additions and 4 deletions.
  1. +1 −0  CHANGELOG.TXT
  2. +9 −4 mRemoteV1/UI/UI.Window.Connection.vb
View
1  CHANGELOG.TXT
@@ -4,6 +4,7 @@
Fixed issue MR-130 - Issues duplicating folders
Fixed issue MR-158 - Password field not accepting Pipe
Fixed issue MR-330 - Portable version saves log to user's profile folder
+ Fixed issue MR-332 - Can't select different tab with one click after disconnecting existing tab
Fixed issue MR-333 - Unnecessary prompt for 'close all open connections?'
1.70 (2013-02-22):
View
13 mRemoteV1/UI/UI.Window.Connection.vb
@@ -276,6 +276,7 @@ Namespace UI
End If
nTab.Selected = True
+ _ignoreChangeSelectedTabClick = False
Return nTab
Catch ex As Exception
@@ -762,6 +763,7 @@ Namespace UI
Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
App.Runtime.OpenConnection(IC.Info, mRemoteNG.Connection.Info.Force.DoNotJump)
+ _ignoreChangeSelectedTabClick = False
End If
End If
Catch ex As Exception
@@ -822,6 +824,7 @@ Namespace UI
Else
Try
Me.TabController.TabPages.Remove(TabToBeClosed)
+ _ignoreChangeSelectedTabClick = False
Catch comEx As System.Runtime.InteropServices.COMException
CloseTab(TabToBeClosed)
Catch ex As Exception
@@ -834,23 +837,25 @@ Namespace UI
End If
End Sub
- Private _selectedTabChanged As Boolean = False
+ Private _ignoreChangeSelectedTabClick As Boolean = False
Private Sub TabController_SelectionChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles TabController.SelectionChanged
- _selectedTabChanged = True
+ _ignoreChangeSelectedTabClick = True
FocusIC()
RefreshIC()
End Sub
Private Sub TabController_MouseUp(ByVal sender As Object, ByVal e As MouseEventArgs) Handles TabController.MouseUp
+ Debug.Print("TabController_MouseUp()")
+ Debug.Print("_ignoreChangeSelectedTabClick = {0}", _ignoreChangeSelectedTabClick)
Try
- If Not Native.GetForegroundWindow() = frmMain.Handle And Not _selectedTabChanged Then
+ If Not Native.GetForegroundWindow() = frmMain.Handle And Not _ignoreChangeSelectedTabClick Then
Dim clickedTab As Magic.Controls.TabPage = TabController.TabPageFromPoint(e.Location)
If clickedTab IsNot Nothing And TabController.SelectedTab IsNot clickedTab Then
Native.SetForegroundWindow(Handle)
TabController.SelectedTab = clickedTab
End If
End If
- _selectedTabChanged = False
+ _ignoreChangeSelectedTabClick = False
Select Case e.Button
Case MouseButtons.Left
Please sign in to comment.
Something went wrong with that request. Please try again.