From e008be6bb9cdf029a269cde2e448cf52503c52a3 Mon Sep 17 00:00:00 2001
From: gitmacer <timfirefox@gmail.com>
Date: Fri, 27 Dec 2019 18:24:14 +0100
Subject: [PATCH 1/8] Update wrapper path

---
 .../Profiles/Move or Die/Control_MoD.xaml.cs  | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml.cs
index 84f589cc2..3e6e2484d 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml.cs	
@@ -58,12 +58,32 @@ private void patch_button_manually_Click(object sender, RoutedEventArgs e)
 
         private int GameID = 323850;
 
-        private bool InstallWrapper(string installpath = "")
+        private bool InstallWrapper()
         {
-            if (String.IsNullOrWhiteSpace(installpath))
-                installpath = Utils.SteamUtils.GetGamePath(this.GameID);
+            string installpath = System.IO.Path.Combine(Utils.SteamUtils.GetGamePath(this.GameID), "Love", "win");
 
+            if (Directory.Exists(installpath))
+            {
+                using (BinaryWriter razer_wrapper_86 = new BinaryWriter(new FileStream(System.IO.Path.Combine(installpath, "RzChromaSDK.dll"), FileMode.Create)))
+                {
+                    razer_wrapper_86.Write(Properties.Resources.Aurora_RazerLEDWrapper86);
+                }
+
+                using (BinaryWriter razer_wrapper_64 = new BinaryWriter(new FileStream(System.IO.Path.Combine(installpath, "RzChromaSDK64.dll"), FileMode.Create)))
+                {
+                    razer_wrapper_64.Write(Properties.Resources.Aurora_RazerLEDWrapper64);
+                }
+
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
 
+        private bool InstallWrapper(string installpath)
+        {
             if (!String.IsNullOrWhiteSpace(installpath))
             {
                 using (BinaryWriter razer_wrapper_86 = new BinaryWriter(new FileStream(System.IO.Path.Combine(installpath, "RzChromaSDK.dll"), FileMode.Create)))
@@ -92,12 +112,21 @@ private bool UninstallWrapper()
                 string path = System.IO.Path.Combine(installpath, "RzChromaSDK.dll");
                 string path64 = System.IO.Path.Combine(installpath, "RzChromaSDK64.dll");
 
+                string enginepath = System.IO.Path.Combine(installpath, "Love", "win", "RzChromaSDK.dll");
+                string enginepath64 = System.IO.Path.Combine(installpath, "Love", "win", "RzChromaSDK64.dll");
+
                 if (File.Exists(path))
                     File.Delete(path);
 
                 if (File.Exists(path64))
                     File.Delete(path64);
 
+                if (File.Exists(enginepath))
+                    File.Delete(enginepath);
+
+                if (File.Exists(enginepath64))
+                    File.Delete(enginepath64);
+
                 return true;
             }
             else

From 41f75cec5befe799e23e2024580a59bad7665e09 Mon Sep 17 00:00:00 2001
From: gitmacer <timfirefox@gmail.com>
Date: Fri, 27 Dec 2019 19:39:26 +0100
Subject: [PATCH 2/8] Add disable MoDs Corsair support patch

---
 .../Profiles/Move or Die/Control_MoD.xaml     |  9 +++-
 .../Profiles/Move or Die/Control_MoD.xaml.cs  | 49 +++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml b/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml
index f8a208626..3687223be 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml	
+++ b/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml	
@@ -26,12 +26,17 @@
                 <Grid>
                     <StackPanel>
                         <CheckBox x:Name="game_enabled" Content="Enable Aurora to provide lighting effects with Move or Die" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Checked="game_enabled_Checked" Unchecked="game_enabled_Checked"/>
-                        <TextBlock Margin="10,10,64,0" Text="In order for Move or Die support to work, you have to apply the Aurora Wrapper Patch for Razer in order for Aurora to receive lighting information. Press the &quot;Patch Move or Die&quot; button to install automatically to the detected game directory. To choose manually press the &quot;Patch Move or Die Manually&quot; button and navigate to the Move or Die install directory. This should not trigger any anti-cheat, but it should be used at your own risk. P.S. You can actually apply this patch to any Razer Chroma supported game, and Aurora will work with it." VerticalAlignment="Top" TextWrapping="Wrap"/>
-                        <StackPanel Orientation="Horizontal" Margin="10,10,0,0">
+                        <TextBlock Margin="10,10,64,0" VerticalAlignment="Top" TextWrapping="Wrap"><Run Text="In order for Move or Die support to work, you have to apply the Aurora Wrapper Patch for Razer in order for Aurora to receive lighting information. Press the &quot;Patch Move or Die&quot; button to install automatically to the detected game directory. To choose manually press the &quot;Patch Move or Die Manually&quot; button and navigate to the "/><Run Text="["/><Run Text="Move or Die install directory"/><Run Text="]"/><Run Text="\Love\win. This should not trigger any anti-cheat, but it should be used at your own risk. P.S. You can actually apply this patch to any Razer Chroma supported game, and Aurora will work with it."/></TextBlock>
+                        <StackPanel Orientation="Horizontal" Margin="10,0,0,0">
                             <Button x:Name="patch_button" Content="Patch Move or Die" HorizontalAlignment="Left"  VerticalAlignment="Top" Click="patch_button_Click"/>
                             <Button x:Name="patch_button_manually" Content="Patch Move or Die Manually" HorizontalAlignment="Left" Margin="10,0,0,0" VerticalAlignment="Top" Click="patch_button_manually_Click"/>
                         </StackPanel>
                         <Button x:Name="unpatch_button" Content="Unpatch Move or Die" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Click="unpatch_button_Click"/>
+                        <TextBlock Margin="10,10,0,0" VerticalAlignment="Top" TextWrapping="Wrap"><Run Text="Optional: "/><Run Text="Move or Die's own Corsair implementation is overriding Aurora's"/><Run Text="."/><Run Text=" "/><Run Text="T"/><Run Text="his patch d"/><Run Text="isable"/><Run Text="s"/><Run Text=" "/><Run Text="RGB "/><Run Text="support for "/><Run Text="Corsair."/></TextBlock>
+                        <StackPanel Orientation="Horizontal" Margin="0,0,0,0">
+                        <Button x:Name="patch_cue_dll" Content="Disable Corsair MoD RGB support" HorizontalAlignment="Left"  VerticalAlignment="Top" Click="patch_cue_dll_button_Click" Margin="10,0,0,0"/>
+                        <Button x:Name="unpatch_cue_dll" Content="Re-enable Corsair MoD RGB support" HorizontalAlignment="Left"  VerticalAlignment="Top" Click="unpatch_cue_dll_button_Click" Margin="10,0,0,0"/>
+                        </StackPanel>
                     </StackPanel>
                 </Grid>
             </TabItem>
diff --git a/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml.cs
index 3e6e2484d..ccf76ba48 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml.cs	
@@ -144,5 +144,54 @@ private void game_enabled_Checked(object sender, RoutedEventArgs e)
                 profile_manager.SaveProfiles();
             }
         }
+
+        private void patch_cue_dll_button_Click(object sender, RoutedEventArgs e)
+        {
+            string gamepath = Utils.SteamUtils.GetGamePath(this.GameID);
+            bool sucess = disable(System.IO.Path.Combine(gamepath, "Love", "win", "CUESDK.dll"));
+            bool sucess64 = disable(System.IO.Path.Combine(gamepath, "Love", "win", "CUESDK.x64.dll"));
+            if (sucess && sucess64)
+                MessageBox.Show("Sucesfully disabled MoD Corsair support.");
+            else if (sucess || sucess64)
+                MessageBox.Show("Error: Partly disabled MoD Corsair support. Is it already disabled?");
+            else
+                MessageBox.Show("Couldn't disabled MoD Corsair support. Is it already disabled?");
+        }
+
+        private bool disable(string file)
+        {
+            if (File.Exists(file))
+            {
+                File.Move(file, file + ".disabled");
+                return true;
+            }
+            else
+                return false;
+        }
+
+        private void unpatch_cue_dll_button_Click(object sender, RoutedEventArgs e)
+        {
+            string gamepath = Utils.SteamUtils.GetGamePath(this.GameID);
+            bool sucess = enable(System.IO.Path.Combine(gamepath, "Love", "win", "CUESDK.dll"));
+            bool sucess64 = enable(System.IO.Path.Combine(gamepath, "Love", "win", "CUESDK.x64.dll"));
+            if (sucess && sucess64)
+                MessageBox.Show("Sucesfully re-enabled MoD Corsair support.");
+            else if (sucess || sucess64)
+                MessageBox.Show("Error: Partly re-enabled MoD Corsair support. Is it already disabled?");
+            else
+                MessageBox.Show("Couldn't re-enabled MoD Corsair support. Is it already disabled?");
+        }
+
+        private bool enable(string file)
+        {
+            file = file + ".disabled";
+            if (File.Exists(file))
+            {
+                File.Move(file, file.Replace(".disabled", ""));
+                return true;
+            }
+            else
+                return false;
+        }
     }
 }

From 157dfd0f1aa478c6a4cc8ef61bf22ba39922f3ec Mon Sep 17 00:00:00 2001
From: gitmacer <timfirefox@gmail.com>
Date: Fri, 27 Dec 2019 19:56:15 +0100
Subject: [PATCH 3/8] Fix crash when you re-enable after file verification

---
 .../Profiles/Move or Die/Control_MoD.xaml.cs       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml.cs
index ccf76ba48..cbf3d05e1 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml.cs	
@@ -162,6 +162,9 @@ private bool disable(string file)
         {
             if (File.Exists(file))
             {
+                if (File.Exists(file + ".disabled"))
+                    File.Delete(file + ".disabled");
+
                 File.Move(file, file + ".disabled");
                 return true;
             }
@@ -177,17 +180,20 @@ private void unpatch_cue_dll_button_Click(object sender, RoutedEventArgs e)
             if (sucess && sucess64)
                 MessageBox.Show("Sucesfully re-enabled MoD Corsair support.");
             else if (sucess || sucess64)
-                MessageBox.Show("Error: Partly re-enabled MoD Corsair support. Is it already disabled?");
+                MessageBox.Show("Error: Partly re-enabled MoD Corsair support. Is it already enabled?");
             else
-                MessageBox.Show("Couldn't re-enabled MoD Corsair support. Is it already disabled?");
+                MessageBox.Show("Couldn't re-enabled MoD Corsair support. Is it already enabled?");
         }
 
         private bool enable(string file)
         {
-            file = file + ".disabled";
             if (File.Exists(file))
+                return false;
+
+            string file_d = file + ".disabled";
+            if (File.Exists(file_d))
             {
-                File.Move(file, file.Replace(".disabled", ""));
+                File.Move(file_d, file);
                 return true;
             }
             else

From bc9ab8c37260585e45bba679b8b90034c3145c9f Mon Sep 17 00:00:00 2001
From: Diogo Trindade <diogotr7@gmail.com>
Date: Mon, 30 Dec 2019 15:59:05 +0000
Subject: [PATCH 4/8] Added very simple file operations util

---
 .../Project-Aurora/Project-Aurora.csproj      |   5 +-
 .../Project-Aurora/Utils/FileUtils.cs         | 117 ++++++++++++++++++
 2 files changed, 120 insertions(+), 2 deletions(-)
 create mode 100644 Project-Aurora/Project-Aurora/Utils/FileUtils.cs

diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
index 9d5bee45e..2525097cb 100644
--- a/Project-Aurora/Project-Aurora/Project-Aurora.csproj
+++ b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -403,8 +403,8 @@
     <Compile Include="Profiles\Terraria\GSI\Nodes\WorldNode.cs" />
     <Compile Include="Profiles\Terraria\TerrariaApplication.cs" />
     <Compile Include="Profiles\Terraria\TerrariaProfile.cs" />
-	<Compile Include="Profiles\Terraria\Control_Terraria.xaml.cs">
-	  <DependentUpon>Control_Terraria.xaml</DependentUpon>
+    <Compile Include="Profiles\Terraria\Control_Terraria.xaml.cs">
+      <DependentUpon>Control_Terraria.xaml</DependentUpon>
     </Compile>
     <Compile Include="Settings\Control_LayerList.xaml.cs">
       <DependentUpon>Control_LayerList.xaml</DependentUpon>
@@ -813,6 +813,7 @@
     <Compile Include="Utils\Converters.cs" />
     <Compile Include="Utils\DesktopUtils.cs" />
     <Compile Include="Utils\DesktopDuplicator.cs" />
+    <Compile Include="Utils\FileUtils.cs" />
     <Compile Include="Utils\FrameworkElementUtils.cs" />
     <Compile Include="Utils\InputEvents.cs" />
     <Compile Include="Utils\MathUtils.cs" />
diff --git a/Project-Aurora/Project-Aurora/Utils/FileUtils.cs b/Project-Aurora/Project-Aurora/Utils/FileUtils.cs
new file mode 100644
index 000000000..6cedd4689
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Utils/FileUtils.cs
@@ -0,0 +1,117 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Aurora.Utils
+{
+    public static class FileUtils
+    {
+        /// <summary>
+        /// Tries to write a given byte array to disk at the given location. Returns true if successfull
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="file"></param>
+        /// <returns></returns>
+        public static bool TryWrite(string path, byte[] file)
+        {
+            try
+            {
+                using (BinaryWriter bw = new BinaryWriter(new FileStream(path, FileMode.Create)))
+                {
+                    bw.Write(file);
+                }
+                return true;
+            }
+            catch (Exception e)
+            {
+                Global.logger.Error($"Error writing file \"{file}\": {e.Message}");
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Tries to delete a given file. Returns true if successful
+        /// </summary>
+        /// <param name="file"></param>
+        /// <returns></returns>
+        public static bool TryDelete(string file)
+        {
+            if (!File.Exists(file))
+                return false;
+
+            try
+            {
+                File.Delete(file);
+                return true;
+            }
+            catch (Exception e)
+            {
+                Global.logger.Error($"Error deleting file \"{file}\": {e.Message}");
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Tried restoring a previously disabled file by renaming it. Returns true if successful
+        /// </summary>
+        /// <param name="file"></param>
+        /// <returns></returns>
+        public static bool TryEnable(string file)
+        {
+            //if the original file exists, it's already enabled
+            if (File.Exists(file))
+                return false;
+
+            var disabled = file + ".disabled";
+
+            //if the disabled file doesnt exist, it can't be enabled
+            if (!File.Exists(disabled))
+                return false;
+
+            //otherwise, enable it
+            try
+            {
+                File.Copy(disabled, file);
+                return true;
+            }
+            catch (Exception e)
+            {
+                Global.logger.Error($"Error enabling file \"{file}\": {e.Message}");
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Disables a file by appending ".disabled" to its name. Returns true if successful
+        /// </summary>
+        /// <param name="file"></param>
+        /// <returns></returns>
+        public static bool TryDisable(string file)
+        {
+            //if the file we want to disable doesnt exist, return
+            if (!File.Exists(file))
+                return false;
+
+            var disabled = file + ".disabled";
+
+            //if the disabled file is already there, delete the original
+            if (File.Exists(disabled))
+                File.Delete(file);
+
+            //otherwise, try to rename the original
+            try
+            {
+                File.Move(file, disabled);
+                return true;
+            }
+            catch (Exception e)
+            {
+                Global.logger.Error($"Error disabling file \"{file}\": {e.Message}");
+                return false;
+            }
+        }
+    }
+}

From b7f51a13bbb1a707fa0921883d65316f9a03dc22 Mon Sep 17 00:00:00 2001
From: Diogo Trindade <diogotr7@gmail.com>
Date: Mon, 30 Dec 2019 16:25:25 +0000
Subject: [PATCH 5/8] cleaned up move or die patching

---
 .../Profiles/Move or Die/Control_MoD.xaml.cs  | 127 +++---------------
 1 file changed, 20 insertions(+), 107 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml.cs
index cbf3d05e1..f82882fd6 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml.cs	
@@ -1,4 +1,5 @@
 using Aurora.Settings;
+using Aurora.Utils;
 using System;
 using System.IO;
 using System.Windows;
@@ -46,9 +47,8 @@ private void unpatch_button_Click(object sender, RoutedEventArgs e)
         private void patch_button_manually_Click(object sender, RoutedEventArgs e)
         {
             var dialog = new System.Windows.Forms.FolderBrowserDialog();
-            System.Windows.Forms.DialogResult result = dialog.ShowDialog();
 
-            if (result == System.Windows.Forms.DialogResult.OK)
+            if (dialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
             {
                 this.InstallWrapper(dialog.SelectedPath);
 
@@ -56,86 +56,25 @@ private void patch_button_manually_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private int GameID = 323850;
+        private const int GameID = 323850;
 
-        private bool InstallWrapper()
+        private bool InstallWrapper(string installpath = "")
         {
-            string installpath = System.IO.Path.Combine(Utils.SteamUtils.GetGamePath(this.GameID), "Love", "win");
+            if (string.IsNullOrWhiteSpace(installpath))
+                installpath = Path.Combine(SteamUtils.GetGamePath(GameID), "Love", "win");
 
-            if (Directory.Exists(installpath))
-            {
-                using (BinaryWriter razer_wrapper_86 = new BinaryWriter(new FileStream(System.IO.Path.Combine(installpath, "RzChromaSDK.dll"), FileMode.Create)))
-                {
-                    razer_wrapper_86.Write(Properties.Resources.Aurora_RazerLEDWrapper86);
-                }
-
-                using (BinaryWriter razer_wrapper_64 = new BinaryWriter(new FileStream(System.IO.Path.Combine(installpath, "RzChromaSDK64.dll"), FileMode.Create)))
-                {
-                    razer_wrapper_64.Write(Properties.Resources.Aurora_RazerLEDWrapper64);
-                }
-
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        private bool InstallWrapper(string installpath)
-        {
-            if (!String.IsNullOrWhiteSpace(installpath))
-            {
-                using (BinaryWriter razer_wrapper_86 = new BinaryWriter(new FileStream(System.IO.Path.Combine(installpath, "RzChromaSDK.dll"), FileMode.Create)))
-                {
-                    razer_wrapper_86.Write(Properties.Resources.Aurora_RazerLEDWrapper86);
-                }
-
-                using (BinaryWriter razer_wrapper_64 = new BinaryWriter(new FileStream(System.IO.Path.Combine(installpath, "RzChromaSDK64.dll"), FileMode.Create)))
-                {
-                    razer_wrapper_64.Write(Properties.Resources.Aurora_RazerLEDWrapper64);
-                }
-
-                return true;
-            }
-            else
-            {
-                return false;
-            }
+            return FileUtils.TryWrite(Path.Combine(installpath, "RzChromaSDK.dll"), Properties.Resources.Aurora_RazerLEDWrapper86) &&
+                FileUtils.TryWrite(Path.Combine(installpath, "RzChromaSDK64.dll"), Properties.Resources.Aurora_RazerLEDWrapper64);
         }
 
         private bool UninstallWrapper()
         {
-            String installpath = Utils.SteamUtils.GetGamePath(this.GameID);
-            if (!String.IsNullOrWhiteSpace(installpath))
-            {
-                string path = System.IO.Path.Combine(installpath, "RzChromaSDK.dll");
-                string path64 = System.IO.Path.Combine(installpath, "RzChromaSDK64.dll");
-
-                string enginepath = System.IO.Path.Combine(installpath, "Love", "win", "RzChromaSDK.dll");
-                string enginepath64 = System.IO.Path.Combine(installpath, "Love", "win", "RzChromaSDK64.dll");
-
-                if (File.Exists(path))
-                    File.Delete(path);
-
-                if (File.Exists(path64))
-                    File.Delete(path64);
-
-                if (File.Exists(enginepath))
-                    File.Delete(enginepath);
-
-                if (File.Exists(enginepath64))
-                    File.Delete(enginepath64);
+            var installpath = SteamUtils.GetGamePath(GameID);
 
-                return true;
-            }
-            else
-            {
-                return false;
-            }
+            return FileUtils.TryDelete(Path.Combine(installpath, "Love", "win", "RzChromaSDK.dll")) &&
+                FileUtils.TryDelete(Path.Combine(installpath, "Love", "win", "RzChromaSDK64.dll"));
         }
 
-
         private void game_enabled_Checked(object sender, RoutedEventArgs e)
         {
             if (IsLoaded)
@@ -147,9 +86,11 @@ private void game_enabled_Checked(object sender, RoutedEventArgs e)
 
         private void patch_cue_dll_button_Click(object sender, RoutedEventArgs e)
         {
-            string gamepath = Utils.SteamUtils.GetGamePath(this.GameID);
-            bool sucess = disable(System.IO.Path.Combine(gamepath, "Love", "win", "CUESDK.dll"));
-            bool sucess64 = disable(System.IO.Path.Combine(gamepath, "Love", "win", "CUESDK.x64.dll"));
+            string gamepath = Utils.SteamUtils.GetGamePath(GameID);
+
+            bool sucess = FileUtils.TryDisable(Path.Combine(gamepath, "Love", "win", "CUESDK.dll"));
+            bool sucess64 = FileUtils.TryDisable(Path.Combine(gamepath, "Love", "win", "CUESDK.x64.dll"));
+
             if (sucess && sucess64)
                 MessageBox.Show("Sucesfully disabled MoD Corsair support.");
             else if (sucess || sucess64)
@@ -158,25 +99,12 @@ private void patch_cue_dll_button_Click(object sender, RoutedEventArgs e)
                 MessageBox.Show("Couldn't disabled MoD Corsair support. Is it already disabled?");
         }
 
-        private bool disable(string file)
-        {
-            if (File.Exists(file))
-            {
-                if (File.Exists(file + ".disabled"))
-                    File.Delete(file + ".disabled");
-
-                File.Move(file, file + ".disabled");
-                return true;
-            }
-            else
-                return false;
-        }
-
         private void unpatch_cue_dll_button_Click(object sender, RoutedEventArgs e)
         {
-            string gamepath = Utils.SteamUtils.GetGamePath(this.GameID);
-            bool sucess = enable(System.IO.Path.Combine(gamepath, "Love", "win", "CUESDK.dll"));
-            bool sucess64 = enable(System.IO.Path.Combine(gamepath, "Love", "win", "CUESDK.x64.dll"));
+            string gamepath = SteamUtils.GetGamePath(GameID);
+            bool sucess = FileUtils.TryEnable(Path.Combine(gamepath, "Love", "win", "CUESDK.dll"));
+            bool sucess64 = FileUtils.TryEnable(Path.Combine(gamepath, "Love", "win", "CUESDK.x64.dll"));
+
             if (sucess && sucess64)
                 MessageBox.Show("Sucesfully re-enabled MoD Corsair support.");
             else if (sucess || sucess64)
@@ -184,20 +112,5 @@ private void unpatch_cue_dll_button_Click(object sender, RoutedEventArgs e)
             else
                 MessageBox.Show("Couldn't re-enabled MoD Corsair support. Is it already enabled?");
         }
-
-        private bool enable(string file)
-        {
-            if (File.Exists(file))
-                return false;
-
-            string file_d = file + ".disabled";
-            if (File.Exists(file_d))
-            {
-                File.Move(file_d, file);
-                return true;
-            }
-            else
-                return false;
-        }
     }
 }

From 7d3cdb34e4df32bc02af63f734a803f04a4346fc Mon Sep 17 00:00:00 2001
From: gitmacer <timfirefox@gmail.com>
Date: Mon, 30 Dec 2019 17:39:25 +0100
Subject: [PATCH 6/8] Move and not copy that the .disabled file will not be
 left over

---
 Project-Aurora/Project-Aurora/Utils/FileUtils.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project-Aurora/Project-Aurora/Utils/FileUtils.cs b/Project-Aurora/Project-Aurora/Utils/FileUtils.cs
index 6cedd4689..ffb70a7f8 100644
--- a/Project-Aurora/Project-Aurora/Utils/FileUtils.cs
+++ b/Project-Aurora/Project-Aurora/Utils/FileUtils.cs
@@ -74,7 +74,7 @@ public static bool TryEnable(string file)
             //otherwise, enable it
             try
             {
-                File.Copy(disabled, file);
+                File.Move(disabled, file);
                 return true;
             }
             catch (Exception e)

From b75bdba286bd5d8228803247b1fddd61a0d9b089 Mon Sep 17 00:00:00 2001
From: gitmacer <timfirefox@gmail.com>
Date: Mon, 30 Dec 2019 18:37:49 +0100
Subject: [PATCH 7/8] prefer the new file instead of the old .disabled file

---
 Project-Aurora/Project-Aurora/Utils/FileUtils.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Utils/FileUtils.cs b/Project-Aurora/Project-Aurora/Utils/FileUtils.cs
index ffb70a7f8..ea00e9505 100644
--- a/Project-Aurora/Project-Aurora/Utils/FileUtils.cs
+++ b/Project-Aurora/Project-Aurora/Utils/FileUtils.cs
@@ -97,11 +97,11 @@ public static bool TryDisable(string file)
 
             var disabled = file + ".disabled";
 
-            //if the disabled file is already there, delete the original
+            //if the disabled file is already there, delete the old disabled file
             if (File.Exists(disabled))
-                File.Delete(file);
+                File.Delete(disabled);
 
-            //otherwise, try to rename the original
+            //rename the original file
             try
             {
                 File.Move(file, disabled);

From 6e155dbfd352c7a1b83b9a432441d1bdbf809069 Mon Sep 17 00:00:00 2001
From: gitmacer <timfirefox@gmail.com>
Date: Mon, 30 Dec 2019 19:38:50 +0100
Subject: [PATCH 8/8] fix possible crash when .disabled file can't be deleted

---
 Project-Aurora/Project-Aurora/Utils/FileUtils.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Utils/FileUtils.cs b/Project-Aurora/Project-Aurora/Utils/FileUtils.cs
index ea00e9505..c4bbd4121 100644
--- a/Project-Aurora/Project-Aurora/Utils/FileUtils.cs
+++ b/Project-Aurora/Project-Aurora/Utils/FileUtils.cs
@@ -96,14 +96,13 @@ public static bool TryDisable(string file)
                 return false;
 
             var disabled = file + ".disabled";
-
-            //if the disabled file is already there, delete the old disabled file
-            if (File.Exists(disabled))
-                File.Delete(disabled);
-
-            //rename the original file
             try
             {
+                //if the disabled file is already there, delete the old disabled file
+                if (File.Exists(disabled))
+                    File.Delete(disabled);
+
+                //rename the original file
                 File.Move(file, disabled);
                 return true;
             }