PowerControl: Improve handling of ? settings

ayufan · Jan 12, 2023 · d1546d1 · d1546d1
1 parent 02d68af
commit d1546d1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/PowerControl/Menu/MenuItemWithOptions.cs b/PowerControl/Menu/MenuItemWithOptions.cs
@@ -105,7 +105,15 @@ private void FinalizeSet()
 
             if (ApplyValue != null && SelectedOption != null)
             {
-                ActiveOption = ApplyValue(SelectedOption);
+                try
+                {
+                    ActiveOption = ApplyValue(SelectedOption);
+                }
+                catch (Exception e)
+                {
+                    CommonHelpers.Log.TraceException("FinalizeSet", Name, e);
+                    Update();
+                }
 
                 if (AfterApply != null && runAfterApply)
                     AfterApply();

diff --git a/PowerControl/Options/CPUFrequency.cs b/PowerControl/Options/CPUFrequency.cs
@@ -32,6 +32,7 @@ public static class CPUFrequency
 
                         switch (selected.ToString())
                         {
+                            case "?":
                             case "Default":
                                 sd.MinCPUClock = 1400;
                                 sd.MaxCPUClock = 3500;

diff --git a/PowerControl/Options/GPUFrequency.cs b/PowerControl/Options/GPUFrequency.cs
@@ -23,14 +23,17 @@ public static class GPUFrequency
                     "Leave the game if it uses anti-cheat protection."))
                     return null;
 
+                if (selected == "?")
+                    selected = "Default";
+
                 return CommonHelpers.Instance.WithGlobalMutex<string>(200, () =>
                 {
                     using (var sd = VangoghGPU.Open())
                     {
                         if (sd is null)
                             return null;
 
-                        if (selected == "Default")
+                        if (selected == "Default" || selected == "?")
                         {
                             sd.HardMinGfxClock = 200;
                             return selected;

diff --git a/PowerControl/Options/TDP.cs b/PowerControl/Options/TDP.cs
@@ -23,6 +23,10 @@ public static class TDP
                     "Leave the game if it uses anti-cheat protection."))
                     return null;
 
+                // If undefined, select max
+                if (selected == "?")
+                    selected = "15W";
+
                 uint mW = uint.Parse(selected.Replace("W", "")) * 1000;
 
                 if (VangoghGPU.IsSupported)