Attempt to fix service "soft crashes", part 1

Sparronator9999 · Sep 7, 2024 · 110e086 · 110e086
1 parent 95dff7c
commit 110e086
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 9 deletions.
diff --git a/YAMDCC.GUI/MainWindow.cs b/YAMDCC.GUI/MainWindow.cs
@@ -186,6 +186,12 @@ private void MainWindow_Load(object sender, EventArgs e)
             }
 
             LoadConf(Path.Combine(DataPath, "CurrentConfig.xml"));
+
+            if (Config is not null && Config.KeyLightConf is not null)
+            {
+                ServiceCommand command = new(Command.GetKeyLightBright, "");
+                IPCClient.PushMessage(command);
+            }
         }
 
         private void MainWindow_Closing(object sender, FormClosingEventArgs e)
@@ -212,26 +218,45 @@ private void IPC_MessageReceived(object sender, PipeMessageEventArgs<ServiceResp
             {
                 switch (e.Message.Response)
                 {
+                    case Response.Success:
+                    {
+                        if (int.TryParse(args[0], out int value))
+                        {
+                            if ((Command)value == Command.ApplyConfig && Config.KeyLightConf is not null)
+                            {
+                                ServiceCommand command = new(Command.GetKeyLightBright, "");
+                                IPCClient.PushMessage(command);
+                            }
+                        }
+                        break;
+                    }
                     case Response.Temp:
+                    {
                         if (int.TryParse(args[0], out int value))
                         {
                             UpdateFanMon(value, 0);
                         }
                         break;
+                    }
                     case Response.FanSpeed:
-                        if (int.TryParse(args[0], out value))
+                    {
+                        if (int.TryParse(args[0], out int value))
                         {
                             UpdateFanMon(value, 1);
                         }
                         break;
+                    }
                     case Response.FanRPM:
-                        if (int.TryParse(args[0], out value))
+                    {
+                        if (int.TryParse(args[0], out int value))
                         {
                             UpdateFanMon(value, 2);
                         }
                         break;
+                    }
                     case Response.KeyLightBright:
-                        if (int.TryParse(args[0], out value))
+                    {
+                        if (int.TryParse(args[0], out int value))
                         {
                             tbKeyLight.Invoke(new Action(delegate
                             {
@@ -241,6 +266,7 @@ private void IPC_MessageReceived(object sender, PipeMessageEventArgs<ServiceResp
                             }));
                         }
                         break;
+                    }
                 }
             }
         }
@@ -700,12 +726,6 @@ 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++)
             {

diff --git a/YAMDCC.Service/svcFanControl.cs b/YAMDCC.Service/svcFanControl.cs
@@ -183,6 +183,8 @@ private void IPCClientMessage(object sender, PipeMessageEventArgs<ServiceCommand
                 case Command.ApplyConfig:
                     LoadConf();
                     ApplySettings();
+                    ServiceResponse response = new(Response.Success, $"{(int)e.Message.Command}");
+                    IPCServer.PushMessage(response, e.Connection.ID);
                     error = 0;
                     break;
                 case Command.FullBlast: