From 53df3b5cfae2c2ebdf22d8226f1318b37c80c794 Mon Sep 17 00:00:00 2001
From: David Sparer <David.Sparer@pearson.com>
Date: Fri, 18 Nov 2016 08:15:24 -0700
Subject: [PATCH] moved the Rdp and Vnc component check using directives into
 the try blocks. connected to #254

---
 mRemoteV1/UI/Window/ComponentsCheckWindow.cs | 48 ++++++++++----------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/mRemoteV1/UI/Window/ComponentsCheckWindow.cs b/mRemoteV1/UI/Window/ComponentsCheckWindow.cs
index 115f15880..3fa420f5c 100644
--- a/mRemoteV1/UI/Window/ComponentsCheckWindow.cs
+++ b/mRemoteV1/UI/Window/ComponentsCheckWindow.cs
@@ -442,9 +442,10 @@ namespace mRemoteNG.UI.Window
         private void CheckRdp()
         {
             pnlCheck1.Visible = true;
-            using (var rdpClient = new AxMsRdpClient8NotSafeForScripting())
+            
+            try
             {
-                try
+                using (var rdpClient = new AxMsRdpClient8NotSafeForScripting())
                 {
                     rdpClient.CreateControl();
 
@@ -465,26 +466,27 @@ namespace mRemoteNG.UI.Window
                     lblCheck1.Text = "RDP (Remote Desktop) " + Language.strCcCheckSucceeded;
                     txtCheck1.Text = string.Format(Language.strCcRDPOK, rdpClient.Version);
                 }
-                catch (Exception ex)
-                {
-                    pbCheck1.Image = Resources.Bad_Symbol;
-                    lblCheck1.ForeColor = Color.Firebrick;
-                    lblCheck1.Text = "RDP (Remote Desktop) " + Language.strCcCheckFailed;
-                    txtCheck1.Text = Language.strCcRDPFailed;
+            }
+            catch (Exception ex)
+            {
+                pbCheck1.Image = Resources.Bad_Symbol;
+                lblCheck1.ForeColor = Color.Firebrick;
+                lblCheck1.Text = "RDP (Remote Desktop) " + Language.strCcCheckFailed;
+                txtCheck1.Text = Language.strCcRDPFailed;
 
-                    Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg,
-                        "RDP " + Language.strCcNotInstalledProperly, true);
-                    Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, true);
-                }
+                Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg,
+                    "RDP " + Language.strCcNotInstalledProperly, true);
+                Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, true);
             }
         }
 
         private void CheckVnc()
         {
             pnlCheck2.Visible = true;
-            using (var vnc = new VncSharp.RemoteDesktop())
+            
+            try
             {
-                try
+                using (var vnc = new VncSharp.RemoteDesktop())
                 {
                     vnc.CreateControl();
 
@@ -499,16 +501,16 @@ namespace mRemoteNG.UI.Window
                     lblCheck2.Text = "VNC (Virtual Network Computing) " + Language.strCcCheckSucceeded;
                     txtCheck2.Text = string.Format(Language.strCcVNCOK, vnc.ProductVersion);
                 }
-                catch (Exception)
-                {
-                    pbCheck2.Image = Resources.Bad_Symbol;
-                    lblCheck2.ForeColor = Color.Firebrick;
-                    lblCheck2.Text = "VNC (Virtual Network Computing) " + Language.strCcCheckFailed;
-                    txtCheck2.Text = Language.strCcVNCFailed;
+            }
+            catch (Exception)
+            {
+                pbCheck2.Image = Resources.Bad_Symbol;
+                lblCheck2.ForeColor = Color.Firebrick;
+                lblCheck2.Text = "VNC (Virtual Network Computing) " + Language.strCcCheckFailed;
+                txtCheck2.Text = Language.strCcVNCFailed;
 
-                    Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg,
-                        "VNC " + Language.strCcNotInstalledProperly, true);
-                }
+                Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg,
+                    "VNC " + Language.strCcNotInstalledProperly, true);
             }
         }