diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb index 06536b2c9..7a1c24f35 100644 --- a/mRemoteV1/App/App.Runtime.vb +++ b/mRemoteV1/App/App.Runtime.vb @@ -711,6 +711,7 @@ Namespace App _LoadUpdate = True Dim t As New Thread(AddressOf LoadConnectionsBGd) + t.SetApartmentState(Threading.ApartmentState.STA) t.Start() End Sub @@ -1081,6 +1082,7 @@ Namespace App _SaveUpdate = True Dim t As New Thread(AddressOf SaveConnectionsBGd) + t.SetApartmentState(Threading.ApartmentState.STA) t.Start() End Sub diff --git a/mRemoteV1/Connection/Connection.Protocol.Base.vb b/mRemoteV1/Connection/Connection.Protocol.Base.vb index e09ad705a..56aa8b5c6 100644 --- a/mRemoteV1/Connection/Connection.Protocol.Base.vb +++ b/mRemoteV1/Connection/Connection.Protocol.Base.vb @@ -98,6 +98,7 @@ Namespace Connection Public Overridable Sub Close() Dim t As New Thread(AddressOf CloseBG) + t.SetApartmentState(Threading.ApartmentState.STA) t.IsBackground = True t.Start() End Sub diff --git a/mRemoteV1/Tools/Tools.Misc.vb b/mRemoteV1/Tools/Tools.Misc.vb index f275a7d60..f8b7ff103 100644 --- a/mRemoteV1/Tools/Tools.Misc.vb +++ b/mRemoteV1/Tools/Tools.Misc.vb @@ -62,6 +62,7 @@ Namespace Tools Public Shared Event SQLUpdateCheckFinished(ByVal UpdateAvailable As Boolean) Public Shared Sub IsSQLUpdateAvailableBG() Dim t As New Threading.Thread(AddressOf IsSQLUpdateAvailable) + t.SetApartmentState(Threading.ApartmentState.STA) t.Start() End Sub diff --git a/mRemoteV1/Tools/Tools.PortScan.vb b/mRemoteV1/Tools/Tools.PortScan.vb index 84426d998..867984491 100644 --- a/mRemoteV1/Tools/Tools.PortScan.vb +++ b/mRemoteV1/Tools/Tools.PortScan.vb @@ -395,6 +395,7 @@ Namespace Tools Public Sub StartScan() sThread = New Thread(AddressOf StartScanBG) + sThread.SetApartmentState(Threading.ApartmentState.STA) sThread.IsBackground = True sThread.Start() End Sub diff --git a/mRemoteV1/UI/UI.Window.Announcment.vb b/mRemoteV1/UI/UI.Window.Announcment.vb index 5af28de7d..4d12e4e2c 100644 --- a/mRemoteV1/UI/UI.Window.Announcment.vb +++ b/mRemoteV1/UI/UI.Window.Announcment.vb @@ -67,8 +67,8 @@ Namespace UI Public Sub CheckForAnnouncement() Try uT = New Thread(AddressOf CheckForAnnouncementBG) + uT.SetApartmentState(ApartmentState.STA) uT.IsBackground = True - 'uT.SetApartmentState(ApartmentState.STA) If Me.IsAnnouncementCheckHandlerDeclared = False Then AddHandler AnnouncementCheckCompleted, AddressOf AnnouncementCheckComplete diff --git a/mRemoteV1/UI/UI.Window.Config.vb b/mRemoteV1/UI/UI.Window.Config.vb index 6305e4835..67b153ff0 100644 --- a/mRemoteV1/UI/UI.Window.Config.vb +++ b/mRemoteV1/UI/UI.Window.Config.vb @@ -1278,6 +1278,7 @@ Namespace UI Me.btnHostStatus.Tag = "checking" HostName = TryCast(ConnectionInfo, mRemoteNG.Connection.Info).Hostname pThread = New Threading.Thread(AddressOf CheckHostAlive) + pThread.SetApartmentState(Threading.ApartmentState.STA) pThread.IsBackground = True pThread.Start() Catch ex As Exception diff --git a/mRemoteV1/UI/UI.Window.SSHTransfer.vb b/mRemoteV1/UI/UI.Window.SSHTransfer.vb index 12c90b755..c9e856341 100644 --- a/mRemoteV1/UI/UI.Window.SSHTransfer.vb +++ b/mRemoteV1/UI/UI.Window.SSHTransfer.vb @@ -395,9 +395,8 @@ Namespace UI RemoteFile = Me.txtRemoteFile.Text Dim t As New Thread(AddressOf StartTransferBG) - - t.IsBackground = True t.SetApartmentState(ApartmentState.STA) + t.IsBackground = True t.Start() Catch ex As Exception mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSSHTransferFailed & vbNewLine & ex.Message) diff --git a/mRemoteV1/UI/UI.Window.Sessions.vb b/mRemoteV1/UI/UI.Window.Sessions.vb index 85f61364e..0662d5cb1 100644 --- a/mRemoteV1/UI/UI.Window.Sessions.vb +++ b/mRemoteV1/UI/UI.Window.Sessions.vb @@ -355,8 +355,8 @@ Namespace UI tDomain = Domain threadSessions = New Threading.Thread(AddressOf GetSessionsBG) - threadSessions.IsBackground = True threadSessions.SetApartmentState(Threading.ApartmentState.STA) + threadSessions.IsBackground = True threadSessions.Start() Catch ex As Exception mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetSessions (UI.Window.Sessions) failed" & vbNewLine & ex.Message, True) @@ -398,8 +398,8 @@ Namespace UI tSessionID = SessionID threadSessions = New Threading.Thread(AddressOf KillSessionBG) - threadSessions.IsBackground = True threadSessions.SetApartmentState(Threading.ApartmentState.STA) + threadSessions.IsBackground = True threadSessions.Start() Catch ex As Exception mC.AddMessage(Messages.MessageClass.ErrorMsg, "KillSession (UI.Window.Sessions) failed" & vbNewLine & ex.Message, True) diff --git a/mRemoteV1/UI/UI.Window.Update.vb b/mRemoteV1/UI/UI.Window.Update.vb index bf39cf757..a27a40cd2 100644 --- a/mRemoteV1/UI/UI.Window.Update.vb +++ b/mRemoteV1/UI/UI.Window.Update.vb @@ -217,8 +217,8 @@ Namespace UI Public Sub CheckForUpdate() Try uT = New Thread(AddressOf CheckForUpdateBG) + uT.SetApartmentState(ApartmentState.STA) uT.IsBackground = True - 'uT.SetApartmentState(ApartmentState.STA) If Me.IsUpdateCheckHandlerDeclared = False Then AddHandler UpdateCheckCompleted, AddressOf UpdateCheckComplete