bug fix of rdp name with blank.

VShawn · Aug 15, 2020 · 0f4796f · 0f4796f
1 parent a7a5c80
commit 0f4796f
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 28 deletions.
diff --git a/PRM.Core/Languages/en-us.xaml b/PRM.Core/Languages/en-us.xaml
diff --git a/PRM.Core/Languages/zh-cn.xaml b/PRM.Core/Languages/zh-cn.xaml
diff --git a/PRM.Core/PRMVersion.cs b/PRM.Core/PRMVersion.cs
@@ -11,7 +11,7 @@ public static class PRMVersion
         public const int Major = 0;
         public const int Minor = 4;
         public const int Build = 8;
-        public const int ReleaseDate = 2008141416;
+        public const int ReleaseDate = 2008150945;
         public static string Version => $"{Major}.{Minor}.{Build}.{ReleaseDate}";
     }
 }
diff --git a/PRemoteM/Model/RemoteWindowPool.cs b/PRemoteM/Model/RemoteWindowPool.cs
@@ -89,53 +89,50 @@ public void ShowRemoteHost(uint serverId)
             {
                 if (server.IsConnWithFullScreen())
                 {
-                    // for those people using 2+ monitor which are in different scale factors, we will try "mstsc.exe" instead of "PRemoteM".
+                    // for those people using 2+ monitors in different scale factors, we will try "mstsc.exe" instead of "PRemoteM".
                     if (Screen.AllScreens.Length > 1
                         && server is ProtocolServerRDP rdp
                         && rdp.RdpFullScreenFlag == ERdpFullScreenFlag.EnableFullAllScreens)
                     {
                         int factor = (int)(new ScreenInfoEx(Screen.PrimaryScreen).ScaleFactor * 100);
                         // check if screens are in different scale factors
                         bool differentScaleFactorFlag = Screen.AllScreens.Select(screen => (int)(new ScreenInfoEx(screen).ScaleFactor * 100)).Any(factor2 => factor != factor2);
-                        if (differentScaleFactorFlag)
+                        if (differentScaleFactorFlag || true)
                         {
                             var tmp = Path.GetTempPath();
-                            var dp = rdp.DispName;
+                            var rdpFileName = $"{rdp.DispName}_{rdp.Port}_{rdp.UserName}";
                             var invalid = new string(Path.GetInvalidFileNameChars()) +
                                       new string(Path.GetInvalidPathChars());
-                            dp = invalid.Aggregate(dp, (current, c) => current.Replace(c.ToString(), ""));
-                            var rdpFile = Path.Combine(tmp, dp + ".rdp");
+                            rdpFileName = invalid.Aggregate(rdpFileName, (current, c) => current.Replace(c.ToString(), ""));
+                            var rdpFile = Path.Combine(tmp, rdpFileName + ".rdp");
                             try
                             {
                                 File.WriteAllText(rdpFile, rdp.ToRdpConfig().ToString());
                                 var p = new Process
                                 {
                                     StartInfo =
-                                {
-                                    FileName = "cmd.exe",
-                                    UseShellExecute = false,
-                                    RedirectStandardInput = true,
-                                    RedirectStandardOutput = true,
-                                    RedirectStandardError = true,
-                                    CreateNoWindow = true
-                                }
+                                    {
+                                        FileName = "cmd.exe",
+                                        UseShellExecute = false,
+                                        RedirectStandardInput = true,
+                                        RedirectStandardOutput = true,
+                                        RedirectStandardError = true,
+                                        CreateNoWindow = true
+                                    }
                                 };
                                 p.Start();
-                                p.StandardInput.WriteLine("mstsc -admin " + rdpFile);
+                                p.StandardInput.WriteLine("mstsc -admin \"" + rdpFile + "\"");
                                 p.StandardInput.WriteLine("exit");
                             }
-                            catch (Exception)
-                            {
-                                throw;
-                            }
                             finally
                             {
+                                // delete tmp rdp file, ETA 10s
                                 var t = new Task(() =>
-                            {
-                                Thread.Sleep(1000 * 10);
-                                if (File.Exists(rdpFile))
-                                    File.Delete(rdpFile);
-                            });
+                                {
+                                    Thread.Sleep(1000 * 10);
+                                    if (File.Exists(rdpFile))
+                                        File.Delete(rdpFile);
+                                });
                                 t.Start();
                             }
                             return;

diff --git a/readme.md b/readme.md
@@ -41,9 +41,9 @@ PRemoteM is a utility that helps you manage remote sessions with HiDpi multi-scr
 - [Password can be encrypted by RSA](https://github.com/VShawn/PRemoteM#Encryption)
 
 # Lastet
-Latest Version: 0.4.8.2008141135
+Latest Version: 0.4.8.2008150945
 
-- [Download](https://github.com/VShawn/PRemoteM/releases/tag/0.4.8.2008141135)
+- [Download](https://github.com/VShawn/PRemoteM/releases/tag/0.4.8.2008150945)
 
 ## Requirements
 ----