From 3eb5bc87b9d7e2ecf8bec65211b45dcb971da1d2 Mon Sep 17 00:00:00 2001
From: creep33 <30846349+creep33@users.noreply.github.com>
Date: Thu, 6 Aug 2026 17:09:57 +0200
Subject: [PATCH] =?UTF-8?q?Di=C3=A1logo=20de=20nueva=20variable=20vac?=
 =?UTF-8?q?=C3=ADo=20al=20abrir=20Burp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/burp/VariableManager.java | 30 +++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/main/java/burp/VariableManager.java b/src/main/java/burp/VariableManager.java
index 6512ff5..e5f03df 100644
--- a/src/main/java/burp/VariableManager.java
+++ b/src/main/java/burp/VariableManager.java
@@ -3527,13 +3527,35 @@ private void createVariableDialog(String preselectedFolderId) {
         // Built by hand instead of showConfirmDialog: a text field embedded in a message panel
         // never gets the initial focus that showInputDialog gives its own field, and Enter has
         // to mean "create" the way it used to.
-        JOptionPane optionPane = new JOptionPane(form, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION) {
+        //
+        // A plain JOptionPane is mandatory here. Subclassing it, even anonymously, makes
+        // UIDefaults.getUI() resolve the look and feel's OptionPaneUI through the extension's class
+        // loader, which cannot see the look and feel Burp bundles. The lookup fails silently, no UI
+        // is installed, and the dialog opens tiny and empty until some other plain JOptionPane has
+        // warmed the UIDefaults class cache.
+        JButton okButton = new JButton(buttonText("OptionPane.okButtonText", "OK"));
+        JButton cancelButton = new JButton(buttonText("OptionPane.cancelButtonText", "Cancel"));
+        JOptionPane optionPane = new JOptionPane(form, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION,
+                null, new Object[]{cancelButton, okButton}, okButton);
+        okButton.addActionListener(e -> optionPane.setValue(JOptionPane.OK_OPTION));
+        cancelButton.addActionListener(e -> optionPane.setValue(JOptionPane.CANCEL_OPTION));
+
+        JDialog dialog = optionPane.createDialog(mainPanel, text("New Variable"));
+
+        // JOptionPane focuses its own initial value from a windowGainedFocus listener that runs
+        // after windowOpened, so acceptOnEnter's windowOpened hook would lose the race. Listeners
+        // fire in registration order, so this one is added after createDialog and has the last
+        // word. The flag keeps it from stealing focus back when a nested dialog closes.
+        boolean[] initialFocusDone = {false};
+        dialog.addWindowFocusListener(new WindowAdapter() {
             @Override
-            public void selectInitialValue() {
+            public void windowGainedFocus(WindowEvent e) {
+                if (initialFocusDone[0]) return;
+                initialFocusDone[0] = true;
                 nameField.requestFocusInWindow();
             }
-        };
-        JDialog dialog = optionPane.createDialog(mainPanel, text("New Variable"));
+        });
+
         nameField.addActionListener(e -> optionPane.setValue(JOptionPane.OK_OPTION));
         dialog.setVisible(true);
         dialog.dispose();