From 32505bfd02a9325e32d202d49dabef222f567367 Mon Sep 17 00:00:00 2001
From: Shai Almog <67850168+shai-almog@users.noreply.github.com>
Date: Thu, 9 Apr 2026 04:20:45 +0300
Subject: [PATCH] Workaround for EDT violation in user code

Fixed #4726 4726

Signed-off-by: Shai Almog <67850168+shai-almog@users.noreply.github.com>
---
 CodenameOne/src/com/codename1/ui/ComboBox.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CodenameOne/src/com/codename1/ui/ComboBox.java b/CodenameOne/src/com/codename1/ui/ComboBox.java
index e370cdd85c..909c1c2973 100644
--- a/CodenameOne/src/com/codename1/ui/ComboBox.java
+++ b/CodenameOne/src/com/codename1/ui/ComboBox.java
@@ -485,8 +485,13 @@ protected void fireClicked() {
         l.eventSource = this;
         l.disposeDialogOnSelection = true;
         Form parentForm = getComponentForm();
-        //l.getSelectedStyle().setBorder(null);
 
+        // unlikely to ever happen but occurs on EDT violations 
+        // github.com/codenameone/CodenameOne/issues/4726
+        if (parentForm == null) {
+            return;
+        }
+        
         int tint = parentForm.getTintColor();
         parentForm.setTintColor(0);
         Dialog popupDialog = createPopupDialog(l);