From 28a8a3debd4ff60b2095dfbafb035bb8d569740c Mon Sep 17 00:00:00 2001
From: Riley McArdle <riley@glyff.net>
Date: Tue, 12 Feb 2013 21:05:50 -0600
Subject: [PATCH] Fix issue MR-202 - The Connection "Tab" show Ampersands as
 underscores.

---
 CHANGELOG.TXT                        | 1 +
 mRemoteV1/UI/UI.Window.Connection.vb | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index a868a1d9a..66268e0f3 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -12,6 +12,7 @@
   Fix issue MR-172 - RDGatewayPassword is unencrypted in confCons.xml file
   Fix issue MR-176 - Del key while editing connection name triggers 'Delete Connection'
   Fix issue MR-181 - Sessions on startup
+  Fix issue MR-202 - The Connection "Tab" show Ampersands as underscores.
   Fix issue MR-277 - Inheritance configuration button not appear in configuration tab 
   Added compatibility check for "Use FIPS compliant algorithms" security setting.
   Improved reporting of errors when encrypting and decrypting connection files.
diff --git a/mRemoteV1/UI/UI.Window.Connection.vb b/mRemoteV1/UI/UI.Window.Connection.vb
index c14aa8bba..e2a77420d 100644
--- a/mRemoteV1/UI/UI.Window.Connection.vb
+++ b/mRemoteV1/UI/UI.Window.Connection.vb
@@ -262,6 +262,8 @@ Namespace UI
                         nTab.Title &= ")"
                     End If
 
+                    nTab.Title = nTab.Title.Replace("&", "&&")
+
                     Dim conIcon As Icon = mRemoteNG.Connection.Icon.FromString(conI.Icon)
                     If conIcon IsNot Nothing Then
                         nTab.Icon = conIcon