Merge branch 'master' of git@git.labs.intellij.net:idea/community

[idea/community.git] / platform / platform-impl / src / com / intellij / ui / popup / WizardPopup.java

diff --git a/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java
index 6d5d990c30f35d0132ee820d549617e9c34bcd32..fbb5bdecdc3de8169b9c1cfe4084baa919c1a951 100644 (file)
--- a/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java
@@ -420,4 +420,13 @@ public abstract class WizardPopup extends AbstractPopup implements ActionListene
       getParent().setFinalRunnable(runnable);
     }
   }
+
+  @Override
+  public void setOk(boolean ok) {
+    if (getParent() == null) {
+      super.setOk(ok);
+    } else {
+      getParent().setOk(ok);
+    }
+  }
 }