Another tweak for MsRdpEx

royalapplications · Apr 15, 2024 · e114ca6 · e114ca6
1 parent cba50c6
commit e114ca6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/RoyalApps.Community.Rdp.WinForms/Controls/RdpControl.cs b/src/RoyalApps.Community.Rdp.WinForms/Controls/RdpControl.cs
@@ -583,16 +583,17 @@ private void CreateRdpClient()
                 }
             }
 
+            if (MsRdpExManager.Instance.AxHookEnabled)
+                RdpClient.RdpExDll = MsRdpExManager.Instance.CoreApi.MsRdpExDllPath;
+
             if (string.IsNullOrWhiteSpace(msRdcAxLibrary))
             {
                 Logger.LogWarning("Microsoft Remote Desktop Client cannot be used, rdclientax.dll was not found");
 
                 Environment.SetEnvironmentVariable("MSRDPEX_MSTSCAX_DLL", msTscAxLibrary);
-                Environment.SetEnvironmentVariable("MSRDPEX_AXNAME", "mstsc");
 
                 RdpConfiguration.UseMsRdc = false;
                 RdpClient.AxName = "mstsc";
-                RdpClient.RdpExDll = null!;
             }
             else
             {
@@ -602,7 +603,6 @@ private void CreateRdpClient()
                 Environment.SetEnvironmentVariable("MSRDPEX_AXNAME", "msrdc");
 
                 RdpClient.AxName = "msrdc";
-                RdpClient.RdpExDll = MsRdpExManager.Instance.CoreApi.MsRdpExDllPath;
             }
         }