From 7d1d03e8cd32ec3b34a23ca4267691a40d52811d Mon Sep 17 00:00:00 2001
From: Riley McArdle <riley@glyff.net>
Date: Thu, 28 Feb 2013 22:46:07 -0600
Subject: [PATCH] Fix connection bar being shown when connecting to an RDP
 connection with redirect key combinations enabled.

---
 CHANGELOG.TXT                                   | 1 +
 mRemoteV1/Connection/Connection.Protocol.RDP.vb | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index d9b81caba..b09190f85 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -10,6 +10,7 @@
   Fixed issue MR-342 - Incorrect view in config pane of new connection after viewing default inheritance
   Added detection of newer versions of connection files and database schemata. mRemoteNG will now refuse to open them to avoid data loss.
   Improved appearance and discoverability of the connection search box.
+  If RDC 7.0 or higher is installed, the connection bar is no longer briefly shown when connecting to an RDP connection with redirect key combinations enabled.
 
   Fixed issue MR-339 - Connection group collapses with just one click
   Fixed issue MR-340 - Object reference not set to an instance of an object.
diff --git a/mRemoteV1/Connection/Connection.Protocol.RDP.vb b/mRemoteV1/Connection/Connection.Protocol.RDP.vb
index e6463b65a..4700f13a6 100644
--- a/mRemoteV1/Connection/Connection.Protocol.RDP.vb
+++ b/mRemoteV1/Connection/Connection.Protocol.RDP.vb
@@ -316,6 +316,12 @@ Namespace Connection
                         RDP.AdvancedSettings2.ContainerHandledFullScreen = 1
                         RDP.AdvancedSettings2.DisplayConnectionBar = False
                         RDP.AdvancedSettings2.PinConnectionBar = False
+
+                        If RDPVersion >= Versions.RDC70 Then
+                            Dim msRdpClientNonScriptable As MSTSCLib.IMsRdpClientNonScriptable5 = RDP.GetOcx()
+                            msRdpClientNonScriptable.DisableConnectionBar = True
+                        End If
+
                         RDP.FullScreen = True
                     End If
                 Catch ex As Exception
@@ -626,6 +632,7 @@ Namespace Connection
             Public Class Versions
                 Public Shared RDC60 As New Version(6, 0, 6000)
                 Public Shared RDC61 As New Version(6, 0, 6001)
+                Public Shared RDC70 As New Version(6, 1, 7600)
             End Class
 
 #Region "Terminal Sessions"