From ee852057ce6a9236c50bfd2d1c83027319bdc38f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20B=C3=BCchel?= <damian.buechel@let.ethz.ch>
Date: Wed, 11 May 2022 10:39:03 +0200
Subject: [PATCH] SEBWIN-567: Ensured action center and taskbar keyboard
 activators do not block one another.

---
 .../Activators/ActionCenterKeyboardActivator.cs        |  4 +---
 .../Activators/TaskbarKeyboardActivator.cs             | 10 ++++------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/SafeExamBrowser.UserInterface.Shared/Activators/ActionCenterKeyboardActivator.cs b/SafeExamBrowser.UserInterface.Shared/Activators/ActionCenterKeyboardActivator.cs
index 17805b07..b08fe1c5 100644
--- a/SafeExamBrowser.UserInterface.Shared/Activators/ActionCenterKeyboardActivator.cs
+++ b/SafeExamBrowser.UserInterface.Shared/Activators/ActionCenterKeyboardActivator.cs
@@ -17,8 +17,8 @@ namespace SafeExamBrowser.UserInterface.Shared.Activators
 {
 	public class ActionCenterKeyboardActivator : KeyboardActivator, IActionCenterActivator
 	{
+		private readonly ILogger logger;
 		private bool A, LeftWindows;
-		private ILogger logger;
 
 		public event ActivatorEventHandler Activated { add { } remove { } }
 		public event ActivatorEventHandler Deactivated { add { } remove { } }
@@ -56,8 +56,6 @@ namespace SafeExamBrowser.UserInterface.Shared.Activators
 			{
 				logger.Debug("Detected toggle sequence for action center.");
 				Toggled?.Invoke();
-
-				return true;
 			}
 
 			return false;
diff --git a/SafeExamBrowser.UserInterface.Shared/Activators/TaskbarKeyboardActivator.cs b/SafeExamBrowser.UserInterface.Shared/Activators/TaskbarKeyboardActivator.cs
index 3bf8e743..6af29234 100644
--- a/SafeExamBrowser.UserInterface.Shared/Activators/TaskbarKeyboardActivator.cs
+++ b/SafeExamBrowser.UserInterface.Shared/Activators/TaskbarKeyboardActivator.cs
@@ -18,7 +18,7 @@ namespace SafeExamBrowser.UserInterface.Shared.Activators
 	public class TaskbarKeyboardActivator : KeyboardActivator, ITaskbarActivator
 	{
 		private readonly ILogger logger;
-		private bool leftWindows;
+		private bool LeftWindows;
 
 		public event ActivatorEventHandler Activated;
 
@@ -34,16 +34,14 @@ namespace SafeExamBrowser.UserInterface.Shared.Activators
 
 			if (key == Key.LWin)
 			{
-				changed = leftWindows != pressed;
-				leftWindows = pressed;
+				changed = LeftWindows != pressed;
+				LeftWindows = pressed;
 			}
 
-			if (leftWindows && changed)
+			if (LeftWindows && changed)
 			{
 				logger.Debug("Detected activation sequence for taskbar.");
 				Activated?.Invoke();
-
-				return true;
 			}
 
 			return false;