From 5d86c821f61090d533f32ccdec283f8fbae84180 Mon Sep 17 00:00:00 2001 From: seerge Date: Sun, 2 Apr 2023 11:56:59 +0200 Subject: [PATCH] Minor fixes --- app/ASUSWmi.cs | 16 +++++++++----- app/Fans.cs | 2 +- app/GHelper.csproj | 4 ++-- app/HardwareMonitor.cs | 2 +- app/Program.cs | 2 +- app/Settings.cs | 4 ++-- app/Startup.cs | 50 ++++++++++++++++++++++++++---------------- 7 files changed, 49 insertions(+), 31 deletions(-) diff --git a/app/ASUSWmi.cs b/app/ASUSWmi.cs index a06bfa91..d630ed4c 100644 --- a/app/ASUSWmi.cs +++ b/app/ASUSWmi.cs @@ -294,11 +294,17 @@ public class ASUSWmi public void SubscribeToEvents(Action EventHandler) { - ManagementEventWatcher watcher = new ManagementEventWatcher(); - watcher.EventArrived += new EventArrivedEventHandler(EventHandler); - watcher.Scope = new ManagementScope("root\\wmi"); - watcher.Query = new WqlEventQuery("SELECT * FROM AsusAtkWmiEvent"); - watcher.Start(); + try + { + ManagementEventWatcher watcher = new ManagementEventWatcher(); + watcher.EventArrived += new EventArrivedEventHandler(EventHandler); + watcher.Scope = new ManagementScope("root\\wmi"); + watcher.Query = new WqlEventQuery("SELECT * FROM AsusAtkWmiEvent"); + watcher.Start(); + } catch + { + Logger.WriteLine("Can't connect to ASUS WMI events"); + } } } diff --git a/app/Fans.cs b/app/Fans.cs index a8d3f476..9796f0b9 100644 --- a/app/Fans.cs +++ b/app/Fans.cs @@ -47,7 +47,7 @@ namespace GHelper chart.ChartAreas[0].AxisY.LabelStyle.Font = new Font("Arial", 7F); - var foreAccent = Color.FromArgb(255, 100, 100, 100); + var foreAccent = Color.FromArgb(255, 180, 180, 180); chart.ChartAreas[0].AxisX.MajorGrid.LineColor = foreAccent; chart.ChartAreas[0].AxisY.MajorGrid.LineColor = foreAccent; diff --git a/app/GHelper.csproj b/app/GHelper.csproj index 9c2f1586..e723c4dd 100644 --- a/app/GHelper.csproj +++ b/app/GHelper.csproj @@ -16,7 +16,7 @@ x64 False True - 0.45 + 0.46 @@ -48,7 +48,7 @@ - + diff --git a/app/HardwareMonitor.cs b/app/HardwareMonitor.cs index b46f0b0c..32f7e502 100644 --- a/app/HardwareMonitor.cs +++ b/app/HardwareMonitor.cs @@ -78,7 +78,7 @@ public static class HardwareMonitor Logger.WriteLine(ex.ToString()); } - if (gpuTemp < 0) + if (gpuTemp is null || gpuTemp < 0) gpuTemp = Program.wmi.DeviceGet(ASUSWmi.Temp_GPU); diff --git a/app/Program.cs b/app/Program.cs index b68ec86e..57ebdf09 100644 --- a/app/Program.cs +++ b/app/Program.cs @@ -131,6 +131,7 @@ namespace GHelper bool switched = settingsForm.AutoGPUMode(); if (!switched) settingsForm.AutoScreen(); + settingsForm.AutoKeyboard(); settingsForm.SetMatrix(); } @@ -139,7 +140,6 @@ namespace GHelper if (SystemInformation.PowerStatus.PowerLineStatus == isPlugged) return; Logger.WriteLine("Windows - Power Mode Changed"); - settingsForm.AutoKeyboard(); SetAutoModes(); } diff --git a/app/Settings.cs b/app/Settings.cs index ae7a8932..2b7930b8 100644 --- a/app/Settings.cs +++ b/app/Settings.cs @@ -1011,10 +1011,10 @@ namespace GHelper if (SystemInformation.PowerStatus.PowerLineStatus == PowerLineStatus.Online) Aura.ApplyBrightness(3); - //Program.wmi.DeviceSet(ASUSWmi.UniversalControl, ASUSWmi.KB_Light_Up); + //Program.wmi.DeviceSet(ASUSWmi.UniversalControl, ASUSWmi.KB_Light_Up); else Aura.ApplyBrightness(0); - //Program.wmi.DeviceSet(ASUSWmi.UniversalControl, ASUSWmi.KB_Light_Down); + //Program.wmi.DeviceSet(ASUSWmi.UniversalControl, ASUSWmi.KB_Light_Down); } diff --git a/app/Startup.cs b/app/Startup.cs index 598acd04..c78fb549 100644 --- a/app/Startup.cs +++ b/app/Startup.cs @@ -22,31 +22,43 @@ public class Startup var userId = WindowsIdentity.GetCurrent().Name; - TaskDefinition td = TaskService.Instance.NewTask(); - td.RegistrationInfo.Description = "GHelper Auto Start"; - td.Triggers.Add(new LogonTrigger { UserId = userId }); - td.Actions.Add(strExeFilePath); - - td.Settings.StopIfGoingOnBatteries = false; - td.Settings.DisallowStartIfOnBatteries = false; - td.Settings.ExecutionTimeLimit = TimeSpan.Zero; - - Debug.WriteLine(strExeFilePath); - Debug.WriteLine(userId); - - try + using (TaskDefinition td = TaskService.Instance.NewTask()) { - TaskService.Instance.RootFolder.RegisterTaskDefinition(taskName, td); - } catch (Exception e) - { - MessageBox.Show(e.ToString(), "Scheduler Error", MessageBoxButtons.OK); + td.RegistrationInfo.Description = "G-Helper Auto Start"; + td.Triggers.Add(new LogonTrigger { UserId = userId }); + td.Actions.Add(strExeFilePath); + + td.Settings.StopIfGoingOnBatteries = false; + td.Settings.DisallowStartIfOnBatteries = false; + td.Settings.ExecutionTimeLimit = TimeSpan.Zero; + + Debug.WriteLine(strExeFilePath); + Debug.WriteLine(userId); + + try + { + TaskService.Instance.RootFolder.RegisterTaskDefinition(taskName, td); + } + catch (Exception e) + { + MessageBox.Show("Can't create a start up task. Try running Task Scheduler by hand and manually deleting GHelper task if it exists there.", "Scheduler Error", MessageBoxButtons.OK); + } } } public static void UnSchedule() { - TaskService taskService = new TaskService(); - taskService.RootFolder.DeleteTask(taskName); + using (TaskService taskService = new TaskService()) + { + try + { + taskService.RootFolder.DeleteTask(taskName); + } + catch (Exception e) + { + MessageBox.Show("Can't remove task. Try running Task Scheduler by hand and manually deleting GHelper task if it exists there.", "Scheduler Error", MessageBoxButtons.OK); + } + } } }