Fixed not being able to patch the logitech wrapper properly

rawaagh · Jul 30, 2017 · d715821 · d715821
1 parent c68bdaf
commit d715821
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 22 deletions.
diff --git a/Project-Aurora/Aurora-LogiLEDWrapper/Aurora-LogiLEDWrapper.rc b/Project-Aurora/Aurora-LogiLEDWrapper/Aurora-LogiLEDWrapper.rc
diff --git a/Project-Aurora/Project-Aurora/Profiles/Evolve/Control_Evolve.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Evolve/Control_Evolve.xaml.cs
@@ -39,11 +39,7 @@ private void SetSettings()
 
         private void patch_button_Click(object sender, RoutedEventArgs e)
         {
-            ProcessStartInfo startInfo = new ProcessStartInfo();
-            startInfo.FileName = @"Aurora.exe";
-            startInfo.Arguments = @"-install_logitech";
-            startInfo.Verb = "runas";
-            Process.Start(startInfo);
+            Program.InstallLogitech();
         }
 
         private void game_enabled_Checked(object sender, RoutedEventArgs e)

diff --git a/Project-Aurora/Project-Aurora/Profiles/GTA5/Control_GTA5.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/GTA5/Control_GTA5.xaml.cs
@@ -95,11 +95,7 @@ private void patch_button_Click(object sender, RoutedEventArgs e)
         {
             try
             {
-                ProcessStartInfo startInfo = new ProcessStartInfo();
-                startInfo.FileName = @"Aurora.exe";
-                startInfo.Arguments = @"-install_logitech";
-                startInfo.Verb = "runas";
-                Process.Start(startInfo);
+                Program.InstallLogitech();
             }
             catch (Exception exc)
             {

diff --git a/Project-Aurora/Project-Aurora/Profiles/TheDivision/Control_TheDivision.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/TheDivision/Control_TheDivision.xaml.cs
@@ -28,11 +28,7 @@ private void SetSettings()
 
         private void patch_button_Click(object sender, RoutedEventArgs e)
         {
-            ProcessStartInfo startInfo = new ProcessStartInfo();
-            startInfo.FileName = @"Aurora.exe";
-            startInfo.Arguments = @"-install_logitech";
-            startInfo.Verb = "runas";
-            Process.Start(startInfo);
+            Program.InstallLogitech();
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)

diff --git a/Project-Aurora/Project-Aurora/Program.cs b/Project-Aurora/Project-Aurora/Program.cs
@@ -368,7 +368,7 @@ private static void CurrentDomain_UnhandledException(object sender, UnhandledExc
             Exit();
         }
 
-        private static void InstallLogitech()
+        public static void InstallLogitech()
         {
             //Check for Admin
             bool isElevated;
@@ -457,7 +457,7 @@ private static void InstallLogitech()
             Global.logger.LogLine("Logitech LED SDK patched successfully", Logging_Level.Info);
             System.Windows.MessageBox.Show("Logitech LED SDK patched successfully");
 
-            Environment.Exit(0);
+            //Environment.Exit(0);
         }
 
         static void OnProcessExit(object sender, EventArgs e)

diff --git a/Project-Aurora/Project-Aurora/Settings/Control_Settings.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Control_Settings.xaml.cs
@@ -841,11 +841,7 @@ private void wrapper_install_logitech_Click(object sender, RoutedEventArgs e)
         {
             try
             {
-                ProcessStartInfo startInfo = new ProcessStartInfo();
-                startInfo.FileName = @"Aurora.exe";
-                startInfo.Arguments = @"-install_logitech";
-                startInfo.Verb = "runas";
-                Process.Start(startInfo);
+                Program.InstallLogitech();
             }
             catch (Exception exc)
             {