Mu-L · pull · Jul 8, 2025 · Jul 7, 2025 · Jul 7, 2025
diff --git a/notes.txt b/notes.txt
@@ -94,4 +94,14 @@
    a hint is selected, it uses the current zoom to determine the actual position of the hint
 + hint.screen-prefix-selection-keys=1 2 (default to none)
 + hint-area-filter.leftscreen=1920x1080
- + mode.hint.leftscreen.grid-cell-width
+ + mode.hint.leftscreen.grid-cell-width
+
+ 2025-06-21T08:02:21.450 [main] ERROR mousemaster.MousemasterApplication -
+ java.lang.NullPointerException: null
+         at mousemaster.WindowsVirtualKey.activeKeyboardLayout(WindowsVirtualKey.java:377)
+         at mousemaster.WindowsPlatform.activeKeyboardLayout(WindowsPlatform.java:230)
+         at mousemaster.Mousemaster.updateActiveKeyboardLayout(Mousemaster.java:110)
+         at mousemaster.Mousemaster.run(Mousemaster.java:55)
+         at mousemaster.MousemasterApplication.main(MousemasterApplication.java:110)
+         at java.base@21.0.1/java.lang.invoke.LambdaForm$DMH/sa346b79c.invokeStaticInit(LambdaForm$DMH)
+ 2025-06-21T08:02:21.457 [main] INFO  mousemaster.MousemasterApplication - An error has occurred. The details of the error should be right above this message. Press Enter in this window to close mousemaster.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>mousemaster</groupId>
     <artifactId>mousemaster</artifactId>
-    <version>79</version>
+    <version>80</version>
     <name>mousemaster</name>
     <!--
     See https://graalvm.github.io/native-build-tools/latest/maven-plugin-quickstart.html

diff --git a/src/main/java/mousemaster/KeyboardManager.java b/src/main/java/mousemaster/KeyboardManager.java
@@ -148,10 +148,21 @@ else if (processingSet.isPartOfComboSequence()) {
                             processingSet.isUnswallowedHintEnd()) {
                             PressKeyEventProcessingSet releaseProcessingSet =
                                     comboWatcher.keyEvent(keyEvent);
+                            if (!currentlyPressedKeys.containsKey(key)) {
+                                // comboWatcher runs a command which can show the hint which calls
+                                // window.show() from WindowsOverlay#transitionHintContainers.
+                                // When doing that, control goes back to JNA which can call the Windows callback,
+                                // which calls WindowsPlatform#keyEvent.
+                                // This second callback should not happen because
+                                // we are already in the callback. Also, the second callback does not
+                                // execute everything: a log line placed in WindowsPlatform#keyEvent would be
+                                // displayed only by the first callback.
+                                return eatAndRegurgitates(processingSet.mustBeEaten(), Set.of());
+                            }
                             if (!releaseProcessingSet.handled()) {
                                 keysToRegurgitate = regurgitatePressedKeys(null);
                             }
-                            else if (releaseProcessingSet.isPartOfCompletedComboSequence()) {
+                        else if (releaseProcessingSet.isPartOfCompletedComboSequence()) {
                                 for (Map.Entry<Combo, PressKeyEventProcessing> entry : releaseProcessingSet.processingByCombo()
                                                                                                            .entrySet()) {
                                     // Mark current combo as completed (so it is not regurgitated, e.g. +rightalt -rightalt).
@@ -179,11 +190,13 @@ else if (releaseProcessingSet.isPartOfCompletedComboSequence()) {
                         }
                     }
                     PressKeyEventProcessingSet pressedProcessingSet = currentlyPressedKeys.remove(key);
+//                    logger.info("Removed key " + key, new Exception());
                     // Only a released event corresponding to a pressed event that was eaten should be eaten.
                     return eatAndRegurgitates(pressedProcessingSet.mustBeEaten(), keysToRegurgitate);
                 }
                 else {
                     currentlyPressedKeys.remove(key);
+//                    logger.info("Removed key " + key, new Exception());
                     return eatAndRegurgitates(false, regurgitatePressedKeys(null));
                 }
             }