From b4908bf2ac2dec1500e9948d629d03f7c8ec47c4 Mon Sep 17 00:00:00 2001
From: Eric Tang <e_l_tang@outlook.com>
Date: Sun, 26 Aug 2018 11:46:38 -0500
Subject: [PATCH] Only allow layer switcher keys to deactivate toggled layers

---
 right/src/usb_report_updater.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c
index a359b68..4452199 100644
--- a/right/src/usb_report_updater.c
+++ b/right/src/usb_report_updater.c
@@ -208,15 +208,15 @@ static void handleSwitchLayerAction(key_state_t *keyState, key_action_t *action)
         doubleTapSwitchLayerKey = NULL;
     }
 
+    if (action->type != KeyActionType_SwitchLayer) {
+        return;
+    }
+
     if (!keyState->previous && isLayerDoubleTapToggled && ToggledLayer == action->switchLayer.layer) {
         ToggledLayer = LayerId_Base;
         isLayerDoubleTapToggled = false;
     }
 
-    if (action->type != KeyActionType_SwitchLayer) {
-        return;
-    }
-
     if (keyState->previous && doubleTapSwitchLayerKey == keyState &&
         Timer_GetElapsedTime(&doubleTapSwitchLayerTriggerTime) > DoubleTapSwitchLayerReleaseTimeout)
     {