Bugfix time!

- Fix a service hang caused by missing keyboard backlight config

- Configurator: Only request keyboard backlight if present in the loaded config

YAMDCC.GUI/MainWindow.cs

@@ -187,9 +187,6 @@ private void MainWindow_Load(object sender, EventArgs e)
             }
 
             LoadConf(Path.Combine(DataPath, "CurrentConfig.xml"));
-
-            ServiceCommand command = new ServiceCommand(Command.GetKeyLightBright, "");
-            IPCClient.PushMessage(command);
         }
 
         private void MainWindow_Closing(object sender, FormClosingEventArgs e)
@@ -679,6 +676,12 @@ private void LoadConf(string configPath)
                 chkWinFnSwap.Enabled = lblWinFnSwap.Enabled = true;
             }
 
+            if (Config.KeyLightConf is not null)
+            {
+                ServiceCommand command = new(Command.GetKeyLightBright, "");
+                IPCClient.PushMessage(command);
+            }
+
             cboFanSel.Items.Clear();
             for (int i = 0; i < Config.FanConfs.Length; i++)
             {

YAMDCC.Service/svcFanControl.cs

@@ -607,14 +607,19 @@ private int SetFullBlast(string name, string args)
 
         private int GetKeyLightBright(string name)
         {
+            if (Config.KeyLightConf is null)
+            {
+                return 0;
+            }
+
             Log.Debug("Getting keyboard backlight brightness...");
             if (EC.AcquireLock(500))
             {
-                int offset = Config.KeyLightConf.MinVal;
-                if (_EC.ReadByte(Config.KeyLightConf.Reg, out byte brightness))
+                if (_EC.ReadByte(Config.KeyLightConf.Reg, out byte value))
                 {
+                    int brightness = value - Config.KeyLightConf.MinVal;
                     Log.Debug($"Keyboard backlight brightness is {brightness}");
-                    ServiceResponse response = new(Response.KeyLightBright, $"{brightness - offset}");
+                    ServiceResponse response = new(Response.KeyLightBright, $"{brightness}");
                     IPCServer.PushMessage(response, name);
                 }
                 else
@@ -629,6 +634,11 @@ private int GetKeyLightBright(string name)
 
         private int SetKeyLightBright(string name, string args)
         {
+            if (Config.KeyLightConf is null)
+            {
+                return 0;
+            }
+
             if (ParseArgs(args, 1, out int[] pArgs))
             {
                 Log.Debug($"Setting keyboard backlight brightness to {pArgs[0]}...");