From ec06aaa247cd1b989723d9d9722a827f2ca5dc6c Mon Sep 17 00:00:00 2001
From: "Maxim.Kolmakov" <maxim.kolmakov@jetbrains.com>
Date: Fri, 1 May 2020 13:51:57 +0200
Subject: [PATCH] IDEA-239850 "Collect Logs and Diagnostic Data" doesn't accept
 "No" as an answer

GitOrigin-RevId: dbdc521b51cb01aec9f041c550e2b33833ea093a
---
 .../com/intellij/ide/actions/CollectZippedLogsAction.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CollectZippedLogsAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CollectZippedLogsAction.java
index 6bb4b323de27..be8360c5a4cf 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/CollectZippedLogsAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/CollectZippedLogsAction.java
@@ -43,10 +43,10 @@ public class CollectZippedLogsAction extends AnAction implements DumbAware {
     final boolean doNotShowDialog = PropertiesComponent.getInstance().getBoolean(CONFIRMATION_DIALOG);
 
     if (!doNotShowDialog) {
-      Messages.showIdeaMessageDialog(
+      int result = Messages.showOkCancelDialog(
         project, IdeBundle.message("message.included.logs.and.settings.may.contain.sensitive.data"),
         IdeBundle.message("dialog.title.sensitive.data"),
-        new String[]{"Show in " + RevealFileAction.getFileManagerName()}, 1, Messages.getWarningIcon(),
+        "Show in " + RevealFileAction.getFileManagerName(), "Cancel", Messages.getWarningIcon(),
         new DialogWrapper.DoNotAskOption.Adapter() {
           @Override
           public void rememberChoice(final boolean selected, final int exitCode) {
@@ -54,6 +54,7 @@ public class CollectZippedLogsAction extends AnAction implements DumbAware {
           }
         }
       );
+      if (result == Messages.CANCEL) return;
     }
     ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> {
       try {