Fixed hotkey features bug

lich426 · Jul 4, 2021 · 8ff56cb · 8ff56cb
1 parent acaeec1
commit 8ff56cb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/FanCtrl.csproj b/FanCtrl.csproj
@@ -28,7 +28,7 @@
     <PublisherName>Lich</PublisherName>
     <SuiteName>FanCtrl</SuiteName>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.4.0.0</ApplicationVersion>
+    <ApplicationVersion>1.4.1.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>

diff --git a/MainForm.cs b/MainForm.cs
@@ -1179,7 +1179,8 @@ private static int onHookHandler(int code, IntPtr wParam, IntPtr lParam)
                                         keyManager.mEnableFanControlData.mIsAlt == sIsAlt &&
                                         keyManager.mEnableFanControlData.mIsLShift == sIsLShift &&
                                         keyManager.mEnableFanControlData.mIsRShift == sIsRShift &&
-                                        keyManager.mEnableFanControlData.mKey == vkCode)
+                                        keyManager.mEnableFanControlData.mKey == vkCode &&
+                                        keyManager.mEnableFanControlData.mKey > 0)
                                     {
                                         sMainForm.onTrayMenuEnableClick(null, null);
                                     }
@@ -1188,7 +1189,8 @@ private static int onHookHandler(int code, IntPtr wParam, IntPtr lParam)
                                         keyManager.mModeNormalData.mIsAlt == sIsAlt &&
                                         keyManager.mModeNormalData.mIsLShift == sIsLShift &&
                                         keyManager.mModeNormalData.mIsRShift == sIsRShift &&
-                                        keyManager.mModeNormalData.mKey == vkCode)
+                                        keyManager.mModeNormalData.mKey == vkCode &&
+                                        keyManager.mModeNormalData.mKey > 0)
                                     {
                                         sMainForm.onTrayMenuNormalClick(null, null);
                                     }
@@ -1197,7 +1199,8 @@ private static int onHookHandler(int code, IntPtr wParam, IntPtr lParam)
                                         keyManager.mModeSilenceData.mIsAlt == sIsAlt &&
                                         keyManager.mModeSilenceData.mIsLShift == sIsLShift &&
                                         keyManager.mModeSilenceData.mIsRShift == sIsRShift &&
-                                        keyManager.mModeSilenceData.mKey == vkCode)
+                                        keyManager.mModeSilenceData.mKey == vkCode &&
+                                        keyManager.mModeSilenceData.mKey > 0)
                                     {
                                         sMainForm.onTrayMenuSilenceClick(null, null);
                                     }
@@ -1206,7 +1209,8 @@ private static int onHookHandler(int code, IntPtr wParam, IntPtr lParam)
                                         keyManager.mModePerformanceData.mIsAlt == sIsAlt &&
                                         keyManager.mModePerformanceData.mIsLShift == sIsLShift &&
                                         keyManager.mModePerformanceData.mIsRShift == sIsRShift &&
-                                        keyManager.mModePerformanceData.mKey == vkCode)
+                                        keyManager.mModePerformanceData.mKey == vkCode &&
+                                        keyManager.mModePerformanceData.mKey > 0)
                                     {
                                         sMainForm.onTrayMenuPerformanceClick(null, null);
                                     }
@@ -1215,7 +1219,8 @@ private static int onHookHandler(int code, IntPtr wParam, IntPtr lParam)
                                         keyManager.mModeGameData.mIsAlt == sIsAlt &&
                                         keyManager.mModeGameData.mIsLShift == sIsLShift &&
                                         keyManager.mModeGameData.mIsRShift == sIsRShift &&
-                                        keyManager.mModeGameData.mKey == vkCode)
+                                        keyManager.mModeGameData.mKey == vkCode &&
+                                        keyManager.mModeGameData.mKey > 0)
                                     {
                                         sMainForm.onTrayMenuGameClick(null, null);
                                     }
@@ -1224,7 +1229,8 @@ private static int onHookHandler(int code, IntPtr wParam, IntPtr lParam)
                                         keyManager.mEnableOSDData.mIsAlt == sIsAlt &&
                                         keyManager.mEnableOSDData.mIsLShift == sIsLShift &&
                                         keyManager.mEnableOSDData.mIsRShift == sIsRShift &&
-                                        keyManager.mEnableOSDData.mKey == vkCode)
+                                        keyManager.mEnableOSDData.mKey == vkCode &&
+                                        keyManager.mEnableOSDData.mKey > 0)
                                     {
                                         sMainForm.onTrayManuEnableOSDClick(null, null);
                                     }

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 //
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
 // 기본값으로 할 수 있습니다.
-[assembly: AssemblyVersion("1.4.0")]
-[assembly: AssemblyFileVersion("1.4.0")]
-[assembly: AssemblyInformationalVersion("1.4.0")]
+[assembly: AssemblyVersion("1.4.1")]
+[assembly: AssemblyFileVersion("1.4.1")]
+[assembly: AssemblyInformationalVersion("1.4.1")]