From 9146d30f06362b768778414ca5381183c45b7431 Mon Sep 17 00:00:00 2001
From: Alexander Ulitin <1911626+ulex@users.noreply.github.com>
Date: Sun, 7 Feb 2021 17:43:39 +0100
Subject: [PATCH] [Bug] Fix media key missing upstroke event (#11162)

[Bug] Pressing media key on a momentarily activated layer may leads to
missing key up events.
---
 tmk_core/common/action.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index a3830abbf..ef01a7177 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -1035,6 +1035,10 @@ void clear_keyboard_but_mods(void) {
  * FIXME: Needs documentation.
  */
 void clear_keyboard_but_mods_and_keys() {
+#ifdef EXTRAKEY_ENABLE
+    host_system_send(0);
+    host_consumer_send(0);
+#endif
     clear_weak_mods();
     clear_macro_mods();
     send_keyboard_report();
@@ -1042,10 +1046,6 @@ void clear_keyboard_but_mods_and_keys() {
     mousekey_clear();
     mousekey_send();
 #endif
-#ifdef EXTRAKEY_ENABLE
-    host_system_send(0);
-    host_consumer_send(0);
-#endif
 }
 
 /** \brief Utilities for actions. (FIXME: Needs better description)