fix rdc bug (#285)and fix phase2 uninstallation bug

Rectify11 · Oct 6, 2023 · 2970eb5 · 2970eb5
1 parent 1bef57a
commit 2970eb5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/Rectify11.Phase2/Helper.cs b/Rectify11.Phase2/Helper.cs
@@ -70,7 +70,20 @@ public static bool SafeFileCopy(string src, string dest)
                 return false;
             }
         }
-        public static void ImportReg(string path)
+		public static bool SafeFileMove(string src, string dest)
+		{
+			try
+			{
+				if (!SafeFileDeletion(dest)) return false;
+				File.Move(src, dest);
+				return true;
+			}
+			catch
+			{
+				return false;
+			}
+		}
+		public static void ImportReg(string path)
         {
             try
             {

diff --git a/Rectify11.Phase2/Program.cs b/Rectify11.Phase2/Program.cs
@@ -220,7 +220,7 @@ private static void Main(string[] args)
                                     string finalPath = FixString(patches.Items[j].HardlinkTarget, false);
                                     Console.WriteLine("Backup: " + backupPath);
                                     Console.WriteLine("Final: " + finalPath);
-                                    SafeFileCopy(backupPath, finalPath);
+                                    SafeFileMove(backupPath, finalPath);
                                     lastfile = uninstallFiles[k];
                                 }
                             }
@@ -234,7 +234,7 @@ private static void Main(string[] args)
                                     string finalPath = FixString(patches.Items[j].HardlinkTarget, true);
                                     Console.WriteLine("Backup: " + backupPath);
                                     Console.WriteLine("Final: " + finalPath);
-                                    SafeFileCopy(backupPath, finalPath);
+                                    SafeFileMove(backupPath, finalPath);
                                 }
                             }
                         }
@@ -246,7 +246,7 @@ private static void Main(string[] args)
                                 string finalPath = FixString(patches.Items[j].HardlinkTarget, false);
                                 Console.WriteLine("Backup: " + backupDiagDir[i]);
                                 Console.WriteLine("Final: " + finalPath + "\n");
-                                SafeFileCopy(backupDiagDir[i], finalPath);
+                                SafeFileMove(backupDiagDir[i], finalPath);
                             }
                         }
                     }

diff --git a/Rectify11Installer/Resources/files.7z b/Rectify11Installer/Resources/files.7z
diff --git a/RectifyControlPanel2 b/RectifyControlPanel2
+11 −1		Rectify11CPL/ElementProvider.cpp
+1 −3		Rectify11CPL/MainPage.xml
+1 −1		dui70