From 2d190fbbf056e50023a91ccbd4729a915a9ee383 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <ampivovarov@gmail.com>
Date: Fri, 23 Sep 2016 16:31:02 +0300
Subject: [PATCH] ui: do not ignore `DialogStyle` if `DoNotAskOption` is set
 but not visible

---
 .../src/com/intellij/openapi/ui/DialogWrapper.java | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
index d335d2f787a4..60ab85cd577a 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
@@ -656,17 +656,11 @@ public abstract class DialogWrapper {
 
     if (doNotAsk != null) {
       myCheckBoxDoNotShowDialog = new JCheckBox(doNotAsk.getDoNotShowMessage());
-      JPanel southPanel = panel;
-
-      if (!doNotAsk.canBeHidden()) {
-        return southPanel;
+      if (doNotAsk.canBeHidden()) {
+        panel = addDoNotShowCheckBox(panel, myCheckBoxDoNotShowDialog);
+        myCheckBoxDoNotShowDialog.setSelected(!doNotAsk.isToBeShown());
+        DialogUtil.registerMnemonic(myCheckBoxDoNotShowDialog, '&');
       }
-
-      final JPanel withCB = addDoNotShowCheckBox(southPanel, myCheckBoxDoNotShowDialog);
-      myCheckBoxDoNotShowDialog.setSelected(!doNotAsk.isToBeShown());
-      DialogUtil.registerMnemonic(myCheckBoxDoNotShowDialog, '&');
-
-      panel = withCB;
     }
 
     if (getStyle() == DialogStyle.COMPACT) {