Merge branch 'master' of github.com:UltimateHackingKeyboard/firmware

UltimateHackingKeyboard · Mar 15, 2024 · f92974d · f92974d
2 parents e46f353 + c8f6e67
commit f92974d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/right/src/macros/commands.c b/right/src/macros/commands.c
@@ -602,7 +602,6 @@ static bool processIfLayerCommand(parser_context_t* ctx, bool negate)
     return (queryLayerIdx == ActiveLayer) != negate;
 }
 
-
 static bool processIfLayerToggledCommand(parser_context_t* ctx, bool negate)
 {
     if (Macros_DryRun) {
@@ -611,7 +610,6 @@ static bool processIfLayerToggledCommand(parser_context_t* ctx, bool negate)
     return (LayerStack_IsLayerToggled()) != negate;
 }
 
-
 static bool processIfCommand(parser_context_t* ctx)
 {
     bool res = Macros_ConsumeBool(ctx);
@@ -1180,7 +1178,12 @@ uint8_t Macros_TryConsumeKeyId(parser_context_t* ctx)
     uint8_t keyId = MacroKeyIdParser_TryConsumeKeyId(ctx);
 
     if (keyId == 255 && isNUM(ctx)) {
-        return Macros_ConsumeInt(ctx);
+        uint8_t num = Macros_ConsumeInt(ctx);
+        if (Macros_ParserError) {
+            return 255;
+        } else {
+            return num;
+        }
     } else {
         return keyId;
     }