From 1b0e5d787a3bc2d5916c85f9d9f7d01a5a6c75ee Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 25 Jun 2015 10:43:57 +0300 Subject: [PATCH] VCS: Abort previous command for the same editor Broken by e0c5ff03ec3c23691d88318f75b9c993ca594054. Task-number: QTCREATORBUG-14630 Change-Id: I123d86b45c6fbc05c7f4cfb52c0be705f75abb75 Reviewed-by: Eike Ziller Reviewed-by: Tobias Hunger --- src/plugins/vcsbase/vcsbaseclient.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index 750e7f96c32..3a0256e5f3f 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -137,6 +137,7 @@ VcsCommand *VcsBaseClientImpl::createCommand(const QString &workingDirectory, auto cmd = new VcsCommand(workingDirectory, processEnvironment()); cmd->setDefaultTimeoutS(vcsTimeoutS()); if (editor) { + editor->setCommand(cmd); connect(editor, &QObject::destroyed, cmd, &VcsCommand::abort); connect(cmd, &VcsCommand::finished, editor, [editor, cmd]() { commandFinished(editor, cmd); });