From 5d48690eda375a6918b5ea556ea7d9a401dd83c7 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Tue, 22 Nov 2016 13:13:09 +0300 Subject: [PATCH] vcs: fix commit dialog disposal * call `close()` directly, without `getOKAction().isEnabled()` check * this was broken in 2f19315, because `getOKAction()` no longer returns new Action instance on each invocation (that is always enabled) --- .../intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java index 1619c707ade8..529fdb7c6d2a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java @@ -645,7 +645,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj CheckinHandler.ReturnResult result = runBeforeCommitHandlers(new Runnable() { @Override public void run() { - CommitChangeListDialog.super.doOKAction(); + close(OK_EXIT_CODE); doCommit(myResultHandler); } }, null);