CPU/GPU禁止关闭监控时菜单显示已关闭的问题。

Author: breadeding

HelpForm.cs

@@ -47,7 +47,8 @@ public HelpForm() {
          "\n更新说明：\n" +
          "（1）功能：新增本机信息，包括IR、南桥、环境传感器温度和主板产品号等；\n" +
          "（2）功能：添加图形模式显示和切换功能；\n" +
-         "（3）修复：CPU与GPU监控均关闭时才会提示不能使用自动转速控制模式。\n\n" +
+         "（3）修复：CPU与GPU监控均关闭时才会提示不能使用自动转速控制模式；\n" +
+         "（4）修复：CPU/GPU禁止关闭监控时菜单显示已关闭的问题。\n\n" +
 
          "本项目已开源至Github：https://github.com/breadeding/OmenSuperHub\n\n" +
          "一.   “风扇配置”菜单说明：\n" +

Program.cs

@@ -36,7 +36,9 @@ static class Program {
     static int alreadyRead = 0, alreadyReadCode = 1000;
     static string fanTable = "cool", fanMode = "performance", fanControl = "auto", tempSensitivity = "high", tppPower = "null", iccMax = "null", acLoadline = "null", cpuPower = "null", gpuPower = "max", autoStart = "off", customIcon = "original", floatingBar = "off", floatingBarLoc = "left", omenKey = "default", dataLocalize = "off";
     static volatile bool monitorFan = true;
+    static bool skipCheckedUpdate = false; // action 内拦截时置 true，阻止 CreateMenuItem 覆盖勾选
     static bool monitorCPU = true, monitorGPU = true, isConnectedToNVIDIA = true, prevIsConnectedToNVIDIA = true, powerOnline = true, checkFloating = false, isTwoBytePL4 = false;
+    static bool hasAmdGpu; // 启动时一次性检测，硬件状态不会改变
     static string monitorRefreshRate = "low"; // 刷新频率：low=1s, high=0.25s
     static List<int> fanSpeedNow = new List<int> { 20, 23 };
     static float respondSpeed = 0.4f;
@@ -127,6 +129,7 @@ static void Main(string[] args) {
         alreadyReadCode = new Random(int.Parse(versionString)).Next(1000, 10000);
 
         isTwoBytePL4 = IsTwoBytePL4Supported();
+        hasAmdGpu = HasAmdGpu();
 
         // Initialize tray icon
         platformSettings = LoadPlatformSettingsFromDll();
@@ -231,7 +234,7 @@ private static object GetSAGHelper() {
       }
 
       public static bool IsSupported() {
-        if (!HasAmdGpu())      // ★ 先检查硬件，避免触发 ADL
+        if (!hasAmdGpu)      // ★ 先检查硬件，避免触发 ADL
           return false;
 
         object helper = GetSAGHelper();
@@ -888,7 +891,7 @@ static void InitTrayIcon() {
       performanceControlMenu.DropDownItems.Add(new ToolStripSeparator()); // Separator between groups
       // 图形模式
       ToolStripMenuItem graphicsModeControlMenu = new ToolStripMenuItem("图形模式");
-      if (HasAmdGpu()) {
+      if (hasAmdGpu) {
         var initAmdMode = AmdGpuSwitcher.GetMode();
         bool amdIsDiscrete = initAmdMode == AmdGpuSwitcher.LocalADLSmartMuxEnableState.ADL_MUXCONTROL_ENABLED;
         graphicsModeControlMenu.DropDownItems.Add(CreateMenuItem("独显直连", "graphicsModeGroup", (s, e) => {
@@ -908,7 +911,7 @@ static void InitTrayIcon() {
       }
       performanceControlMenu.DropDownItems.Add(graphicsModeControlMenu);
       graphicsModeControlMenu.DropDownOpening += (s, e) => {
-        if (HasAmdGpu()) {
+        if (hasAmdGpu) {
           var amdMode = AmdGpuSwitcher.GetMode();
           bool isDisc = amdMode == AmdGpuSwitcher.LocalADLSmartMuxEnableState.ADL_MUXCONTROL_ENABLED;
           UpdateCheckedState("graphicsModeGroup", isDisc ? "独显直连" : "混合输出");
@@ -1143,6 +1146,7 @@ static void InitTrayIcon() {
         if (!monitorGPU && fanControl == "auto") {
           MessageBox.Show("当前为自动转速模式，若要关闭监控需切换为其他转速控制模式。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
           UpdateCheckedState("monitorCPUGroup", monitorCPU ? "开启CPU监控" : "关闭CPU监控");
+          skipCheckedUpdate = true;
           return;
         }
         monitorCPU = false;
@@ -1187,6 +1191,7 @@ static void InitTrayIcon() {
         if (!monitorCPU && fanControl == "auto") {
           MessageBox.Show("当前为自动转速模式，若要关闭监控需切换为其他转速控制模式。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
           UpdateCheckedState("monitorGPUGroup", monitorGPU ? "开启GPU监控" : "关闭GPU监控");
+          skipCheckedUpdate = true;
           return;
         }
         monitorGPU = false;
@@ -1755,7 +1760,11 @@ static ToolStripMenuItem CreateMenuItem(string text, string group, EventHandler
 
         action(s, e); // Perform the original action
         if (group != null) {
-          UpdateCheckedState(group, null, item);
+          if (skipCheckedUpdate) {
+            skipCheckedUpdate = false;
+          } else {
+            UpdateCheckedState(group, null, item);
+          }
         }
       };
       return item;