JMenu addNotify too early

BobHanson · BobHanson · commit e3348966de51 · 2020-01-12T06:09:28.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JMenu.java b/sources/net.sf.j2s.java.core/src/javax/swing/JMenu.java
@@ -337,7 +337,9 @@ public void setPopupMenuVisible(boolean b) {
 //            System.out.println("in JMenu.setPopupMenuVisible " + b);
 //            // Thread.dumpStack();
 //        }
-//
+
+    	if (b && popupMenu.getPeer() == null)
+    		popupMenu.addNotify();// BH SwingJS 
         boolean isVisible = isPopupMenuVisible();
         if (b != isVisible && (isEnabled() || !b)) {
             ensurePopupMenuCreated();
@@ -544,7 +546,6 @@ private void ensurePopupMenuCreated() {
             this.popupMenu = new JPopupMenu();
             popupMenu.setInvoker(this);
             popupListener = createWinListener(popupMenu);
-            popupMenu.addNotify();// BH SwingJS 
         }
     }
 
