ClipboardWatcher, Common: Improve checking for client
This commit is contained in:
@@ -55,6 +55,8 @@ Public Class frmDocumentResultList
|
||||
Private Property ResultLists As List(Of DocumentResult)
|
||||
|
||||
Private IsLoading As Boolean = True
|
||||
Private ClientIsOnline As Boolean = False
|
||||
|
||||
Private _DragBoxFromMouseDown As Rectangle
|
||||
Private _ScreenOffset As Point
|
||||
Private _CurrentDocument As DocumentResultList.Document = Nothing
|
||||
@@ -125,17 +127,28 @@ Public Class frmDocumentResultList
|
||||
End Sub
|
||||
|
||||
Private Function GetOperationMode() As OperationMode
|
||||
Dim oOperationMode As OperationMode
|
||||
Dim oOperationMode As OperationMode = OperationMode.NoAppServer
|
||||
|
||||
If Environment.Service IsNot Nothing AndAlso Environment.Service.Client.IsOnline AndAlso Environment.Service.Address <> String.Empty Then
|
||||
oOperationMode = OperationMode.WithAppServer
|
||||
Else
|
||||
oOperationMode = OperationMode.NoAppServer
|
||||
End If
|
||||
Try
|
||||
If Environment.Service.Client IsNot Nothing AndAlso Environment.Service.Client.IsOnline Then
|
||||
oOperationMode = OperationMode.WithAppServer
|
||||
Else
|
||||
oOperationMode = OperationMode.NoAppServer
|
||||
End If
|
||||
|
||||
If Params.OperationModeOverride <> OperationMode.None Then
|
||||
oOperationMode = Params.OperationModeOverride
|
||||
End If
|
||||
Logger.Debug("OperationMode set to [{0}]", oOperationMode)
|
||||
|
||||
If Params.OperationModeOverride <> OperationMode.None Then
|
||||
Logger.Debug("Overriding OperationMode with [{0}]", Params.OperationModeOverride)
|
||||
oOperationMode = Params.OperationModeOverride
|
||||
End If
|
||||
|
||||
Logger.Debug("OperationMode is now [{0}]", oOperationMode)
|
||||
|
||||
Catch ex As Exception
|
||||
Logger.Error(ex)
|
||||
Logger.Warn("Error while determining OperationMode. Setting to [{0}]", oOperationMode)
|
||||
End Try
|
||||
|
||||
Return oOperationMode
|
||||
End Function
|
||||
|
||||
Reference in New Issue
Block a user