From 003e25d488ef8b4ac9b797cc26c667b84f246f09 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 29 Sep 2013 22:57:21 +0300 Subject: VCS: Abort previous command for the same editor It is very common to have output from a previous (longer) command appear instead of the newly created one. For example: Open a log. Check "Show Diff" and immediately uncheck it. If this is done fast enough (or with a high Log Count limit) the output with the diff will appear instead of the normal log. Change-Id: Ie64cc4a383a261f5328a4d0486eec93f73766679 Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/plugins/git/gitclient.cpp') diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 813539d62a..d48d5805f2 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -2467,8 +2467,11 @@ VcsBase::Command *GitClient::createCommand(const QString &workingDirectory, VcsBase::Command *command = new VcsBase::Command(gitBinaryPath(), workingDirectory, processEnvironment()); command->setCodec(getSourceCodec(currentDocumentPath())); command->setCookie(QVariant(editorLineNumber)); - if (editor) - connect(command, SIGNAL(finished(bool,int,QVariant)), editor, SLOT(commandFinishedGotoLine(bool,int,QVariant))); + if (editor) { + editor->setCommand(command); + connect(command, SIGNAL(finished(bool,int,QVariant)), + editor, SLOT(commandFinishedGotoLine(bool,int,QVariant))); + } if (useOutputToWindow) { command->addFlags(VcsBasePlugin::ShowStdOutInLogWindow); command->addFlags(VcsBasePlugin::ShowSuccessMessage); -- cgit v1.2.1