Fix issue preventing assignment of Function keys

adrianlungu · Nov 29, 2020 · 6c6c349 · 6c6c349
1 parent 1ddc4d4
commit 6c6c349
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/ScreenSleep/MainWindow.xaml.cs b/ScreenSleep/MainWindow.xaml.cs
@@ -70,6 +70,8 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
         {
             if (msg == 0x0312 && wParam.ToInt32() == Settings.HotkeyId)
             {
+
+
                 Task.Delay(1000 * Properties.Settings.Default.SleepTimer).ContinueWith(t => TurnOff_OnClick(null, null));
             }
 

diff --git a/ScreenSleep/Properties/AssemblyInfo.cs b/ScreenSleep/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.4")]
-[assembly: AssemblyFileVersion("1.0.0.4")]
+[assembly: AssemblyVersion("1.0.0.5")]
+[assembly: AssemblyFileVersion("1.0.0.5")]
diff --git a/ScreenSleep/Settings.xaml.cs b/ScreenSleep/Settings.xaml.cs
@@ -65,9 +65,14 @@ public static void SetupSleepShortcut(WindowInteropHelper helper)
         {
             var shortcut = Properties.Settings.Default.SleepShortcut.ToLower();
 
-            string keyString = shortcut.Substring(shortcut.Length - 1);
+            string keyString = shortcut;
             var modifiers = 0;
 
+            if (shortcut.Contains("+"))
+            {
+                keyString = shortcut.Substring(shortcut.Length - 1);
+            }
+
             if (shortcut.Contains("alt"))
             {
                 modifiers += 1;
-Original file line number
+Diff line change
@@ Expand Up @@
             {
                 if (msg == 0x0312 && wParam.ToInt32() == Settings.HotkeyId)
                 {
                     Task.Delay(1000 * Properties.Settings.Default.SleepTimer).ContinueWith(t => TurnOff_OnClick(null, null));
                 }
@@ Expand Down @@