Merge pull request #19 from MrBrianGale/Issue18

Fixes Issue 18
This commit is contained in:
kimmknight 2020-06-26 23:43:54 +10:00 committed by GitHub
commit 597749d45d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions

View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below: ' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("5.4.0.0")> <Assembly: AssemblyVersion("5.4.0.18")>
<Assembly: AssemblyFileVersion("5.4.0.0")> <Assembly: AssemblyFileVersion("5.4.0.18")>

View File

@ -224,10 +224,13 @@ Public Class RemoteAppCreateClientConnection
If ExtractToIco(RemoteApp.IconPath, RemoteApp.IconIndex, IconFilePath) = False Then If ExtractToIco(RemoteApp.IconPath, RemoteApp.IconIndex, IconFilePath) = False Then
MessageBox.Show("Icon could not be created the RemoteApp. RDP file will still be created.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Exclamation) MessageBox.Show("Icon could not be created the RemoteApp. RDP file will still be created.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Exclamation)
End If End If
For Each FTA As RemoteAppLib.FileTypeAssociation In RemoteApp.FileTypeAssociations ' Check if there are file type associations before trying to work with the file type association icons
Dim ProductFileName = VB.Left(RDPPath, RDPPath.Length - 4) If Not (RemoteApp.FileTypeAssociations Is Nothing) Then
ExtractFTIcon(ProductFileName, FTA) For Each FTA As RemoteAppLib.FileTypeAssociation In RemoteApp.FileTypeAssociations
Next Dim ProductFileName = VB.Left(RDPPath, RDPPath.Length - 4)
ExtractFTIcon(ProductFileName, FTA)
Next
End If
End If End If
Me.Close() Me.Close()
Else Else