Disposing popup corrupts appearing popup (fix attempt #2)

2026-09-27 10:03:11 +07:00 · 2016-11-08 22:32:37 +03:00
parent ebe978a24e
commit cc8dad95b4
1 changed files with 9 additions and 2 deletions
@@ -130,8 +130,15 @@ public class PopupDispatcher implements AWTEventListener, KeyEventDispatcher, Id
  }

  public static void unsetShowing(WizardPopup aBaseWizardPopup) {
-    ourShowingStep = aBaseWizardPopup.getParent();
-  }
+    if (ourActiveWizardRoot != null) {
+      for (WizardPopup wp = aBaseWizardPopup; wp != null; wp = wp.getParent()) {
+        if (wp == ourActiveWizardRoot) {
+          ourShowingStep = aBaseWizardPopup.getParent();
+          return;
+        }
+      }
+    }
+   }

  public static WizardPopup getActiveRoot() {
    return ourActiveWizardRoot;