From 620086109ada596969033112a71b754c3e29c186 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 21 Jan 2019 15:30:03 +0200 Subject: [PATCH] VCS: Make "Keep Editing" the default only when closing the editor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the prompt is displayed on button press, the default is Commit. Task-number: QTCREATORBUG-18799 Change-Id: I706a2700e08bb45f44019a0fe8d44365438ee9f3 Reviewed-by: André Hartmann --- src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 2a54f36cf6c..7def2dc94f7 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -592,7 +592,9 @@ VcsBaseSubmitEditor::PromptSubmitResult // On Windows there is no mnemonic for Close. Set it explicitly. mb.button(QDialogButtonBox::Close)->setText(tr("&Close")); cancelButton->setText(tr("&Keep Editing")); - cancelButton->setDefault(true); + // forcePrompt is true when the editor is closed, and false when triggered by the submit action + if (forcePrompt) + cancelButton->setDefault(true); if (QPushButton *commitButton = mb.button(QDialogButtonBox::Ok)) { commitButton->setText(withUnusedMnemonic(commitName, {cancelButton, mb.button(QDialogButtonBox::Close)}));