From f2e1c9e9595980338378c4bc35f17041d77aa568 Mon Sep 17 00:00:00 2001 From: David Sparer Date: Thu, 17 Nov 2016 15:16:45 -0700 Subject: [PATCH] moved the using directive of the ICA check into the try block. this seems to resolve #254 --- mRemoteV1/UI/Window/ComponentsCheckWindow.cs | 25 ++++++++++---------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/mRemoteV1/UI/Window/ComponentsCheckWindow.cs b/mRemoteV1/UI/Window/ComponentsCheckWindow.cs index d69d5eff..115f1588 100644 --- a/mRemoteV1/UI/Window/ComponentsCheckWindow.cs +++ b/mRemoteV1/UI/Window/ComponentsCheckWindow.cs @@ -6,6 +6,7 @@ using System.IO; using mRemoteNG.App; using System.Threading; using AxMSTSCLib; +using AxWFICALib; using Gecko; using mRemoteNG.App.Info; using mRemoteNG.Connection.Protocol.RDP; @@ -551,9 +552,10 @@ namespace mRemoteNG.UI.Window private void CheckIca() { pnlCheck4.Visible = true; - using (var ica = new AxWFICALib.AxICAClient { Parent = this }) + + try { - try + using (var ica = new AxICAClient {Parent = this}) { ica.CreateControl(); @@ -568,17 +570,16 @@ namespace mRemoteNG.UI.Window lblCheck4.Text = @"ICA (Citrix ICA) " + Language.strCcCheckSucceeded; txtCheck4.Text = string.Format(Language.strCcICAOK, ica.Version); } - catch (Exception ex) - { - pbCheck4.Image = Resources.Bad_Symbol; - lblCheck4.ForeColor = Color.Firebrick; - lblCheck4.Text = @"ICA (Citrix ICA) " + Language.strCcCheckFailed; - txtCheck4.Text = Language.strCcICAFailed; + } + catch (Exception ex) + { + pbCheck4.Image = Resources.Bad_Symbol; + lblCheck4.ForeColor = Color.Firebrick; + lblCheck4.Text = @"ICA (Citrix ICA) " + Language.strCcCheckFailed; + txtCheck4.Text = Language.strCcICAFailed; - Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, - "ICA " + Language.strCcNotInstalledProperly, true); - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, true); - } + Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "ICA " + Language.strCcNotInstalledProperly, true); + Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, true); } }