From e13f58658df8673fa554bb60b34a643d5bd7d0ea Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sun, 29 Dec 2024 10:20:18 +0100
Subject: Fix crash in LayoutModifier

---
 srcs/juloo.keyboard2/LayoutModifier.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'srcs/juloo.keyboard2/LayoutModifier.java')

diff --git a/srcs/juloo.keyboard2/LayoutModifier.java b/srcs/juloo.keyboard2/LayoutModifier.java
index 1e49914..31f5468 100644
--- a/srcs/juloo.keyboard2/LayoutModifier.java
+++ b/srcs/juloo.keyboard2/LayoutModifier.java
@@ -152,7 +152,9 @@ public final class LayoutModifier
               return KeyValue.getKeyByName("change_method_prev");
             break;
           case ACTION:
-            if (globalConfig.swapEnterActionKey && globalConfig.actionLabel != null)
+            if (globalConfig.actionLabel == null)
+              return null; // Remove the action key
+            if (globalConfig.swapEnterActionKey)
               return KeyValue.getKeyByName("enter");
             return KeyValue.makeActionKey(globalConfig.actionLabel);
           case SWITCH_FORWARD:
-- 
cgit v1.2.3