From 3bab1a271bdc636cb70692f76e156e21985023ed Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Sat, 25 Nov 2023 19:53:54 +0100
Subject: [PATCH] Moved action block to prevent unnecessary actions on main
 window toggle https://github.com/seerge/g-helper/pull/1651

---
 app/Program.cs  | 60 ++++++++++++++++++++++++-------------------------
 app/USB/Aura.cs |  1 +
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/app/Program.cs b/app/Program.cs
index 761005f1..a2488fe5 100644
--- a/app/Program.cs
+++ b/app/Program.cs
@@ -119,7 +119,35 @@ namespace GHelper
 
             if (Environment.CurrentDirectory.Trim('\\') == Application.StartupPath.Trim('\\') || action.Length > 0)
             {
-                SettingsToggle(action, false);
+                SettingsToggle(false);
+            }
+
+            switch (action)
+            {
+                case "cpu":
+                    Startup.ReScheduleAdmin();
+                    settingsForm.FansToggle();
+                    break;
+                case "gpu":
+                    Startup.ReScheduleAdmin();
+                    settingsForm.FansToggle(1);
+                    break;
+                case "gpurestart":
+                    gpuControl.RestartGPU(false);
+                    break;
+                case "services":
+                    settingsForm.extraForm = new Extra();
+                    settingsForm.extraForm.Show();
+                    settingsForm.extraForm.ServiesToggle();
+                    break;
+                case "uv":
+                    Startup.ReScheduleAdmin();
+                    settingsForm.FansToggle(2);
+                    modeControl.SetRyzen();
+                    break;
+                default:
+                    Startup.StartupCheck();
+                    break;
             }
 
             Application.Run();
@@ -213,7 +241,7 @@ namespace GHelper
             SetAutoModes(true);
         }
 
-        public static void SettingsToggle(string action = "", bool checkForFocus = true, bool trayClick = false)
+        public static void SettingsToggle(bool checkForFocus = true, bool trayClick = false)
         {
             if (settingsForm.Visible)
             {
@@ -241,34 +269,6 @@ namespace GHelper
                 settingsForm.Top = Screen.FromControl(settingsForm).WorkingArea.Height - 10 - settingsForm.Height;
 
                 settingsForm.VisualiseGPUMode();
-
-                switch (action)
-                {
-                    case "cpu":
-                        Startup.ReScheduleAdmin();
-                        settingsForm.FansToggle();
-                        break;
-                    case "gpu":
-                        Startup.ReScheduleAdmin();
-                        settingsForm.FansToggle(1);
-                        break;
-                    case "gpurestart":
-                        gpuControl.RestartGPU(false);
-                        break;
-                    case "services":
-                        settingsForm.extraForm = new Extra();
-                        settingsForm.extraForm.Show();
-                        settingsForm.extraForm.ServiesToggle();
-                        break;
-                    case "uv":
-                        Startup.ReScheduleAdmin();
-                        settingsForm.FansToggle(2);
-                        modeControl.SetRyzen();
-                        break;
-                    default:
-                        Startup.StartupCheck();
-                        break;
-                }
             }
         }
 
diff --git a/app/USB/Aura.cs b/app/USB/Aura.cs
index cabed84f..d97998d9 100644
--- a/app/USB/Aura.cs
+++ b/app/USB/Aura.cs
@@ -134,6 +134,7 @@ namespace GHelper.USB
             {
                 var device = AsusHid.FindDevices(AsusHid.AURA_ID).FirstOrDefault();
                 if (device is null) return;
+                Logger.WriteLine($"GA402: {device.ReleaseNumberBcd} {device.ReleaseNumber}");
                 if (device.ReleaseNumberBcd == 22 || device.ReleaseNumberBcd == 23) isSingleColor = true;
             }
         }