diff --git a/remoteapp-tool/My Project/AssemblyInfo.vb b/remoteapp-tool/My Project/AssemblyInfo.vb index 51c2b9c..c2be0e3 100644 --- a/remoteapp-tool/My Project/AssemblyInfo.vb +++ b/remoteapp-tool/My Project/AssemblyInfo.vb @@ -18,7 +18,7 @@ Imports System.Runtime.InteropServices 'The following GUID is for the ID of the typelib if this project is exposed to COM - + ' Version information for an assembly consists of the following four values: ' @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/remoteapp-tool/RemoteAppCreateClientConnection.vb b/remoteapp-tool/RemoteAppCreateClientConnection.vb index 9d70e16..c84bb0c 100644 --- a/remoteapp-tool/RemoteAppCreateClientConnection.vb +++ b/remoteapp-tool/RemoteAppCreateClientConnection.vb @@ -224,10 +224,13 @@ Public Class RemoteAppCreateClientConnection 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) End If - For Each FTA As RemoteAppLib.FileTypeAssociation In RemoteApp.FileTypeAssociations - Dim ProductFileName = VB.Left(RDPPath, RDPPath.Length - 4) - ExtractFTIcon(ProductFileName, FTA) - Next + ' Check if there are file type associations before trying to work with the file type association icons + If Not (RemoteApp.FileTypeAssociations Is Nothing) Then + For Each FTA As RemoteAppLib.FileTypeAssociation In RemoteApp.FileTypeAssociations + Dim ProductFileName = VB.Left(RDPPath, RDPPath.Length - 4) + ExtractFTIcon(ProductFileName, FTA) + Next + End If End If Me.Close() Else