AppStd/Modules
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo

Browse Source
This commit is contained in:
SchreiberM
2020-05-06 15:23:22 +02:00
parent 66bab9b7c1 6e577627d3
commit 2ff902fc1e
34 changed files with 880 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Modules.Windream/Windream.vb
View File

@@ -766,15 +766,15 @@ Public Class Windream
'If UsesDriveLetter Then
' Remove Driveletter eg. W:\
If oNormalizedPath.StartsWith($"{ClientDriveLetter}:\") Then
_logger.Debug($"Replacing ClientDriveLetter: [{ClientDriveLetter}]")
oNormalizedPath = oNormalizedPath.Substring(ClientDriveLetter.Length + 2)
End If
_logger.Debug($"Replacing ClientDriveLetter: [{ClientDriveLetter}]")
oNormalizedPath = oNormalizedPath.Substring(ClientDriveLetter.Length + 2)
End If
'Else
If oNormalizedPath.ToLower.StartsWith(ClientBasePath.ToLower) Then
_logger.Debug($"Replacing ClientBasePath: [{ClientBasePath}]")
' Remove Windream Base Path eg. \\windream\objects\
oNormalizedPath = oNormalizedPath.Substring(ClientBasePath.Length - 1)
End If
_logger.Debug($"Replacing ClientBasePath: [{ClientBasePath}]")
' Remove Windream Base Path eg. \\windream\objects\
oNormalizedPath = oNormalizedPath.Substring(ClientBasePath.Length - 1)
End If
'End If
oNormalizedPath = oNormalizedPath.Replace("\\", "\")
@@ -1470,6 +1470,7 @@ Public Class Windream
End If
If TestObjectExists(ObjectName, ObjectType) = False Then
_logger.Warn("GetObjectByName: Object {0} does not exist!", ObjectName)
Return Nothing
End If
@@ -1488,6 +1489,7 @@ Public Class Windream
End If
If TestObjectExists(ObjectName, ObjectType) = False Then
_logger.Warn("GetObjectByPath: Object {0} does not exist!", ObjectName)
Return Nothing
End If