forked from qt-creator/qt-creator
VcsCommandDecorator: Fix call to abort()
Call ShellCommand::abort() instead of std::abort().
Amends a640a6ae8c
Change-Id: I3e71c1e919ef05100934011d1f9a80961249cddf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -118,9 +118,9 @@ VcsCommandDecorator::VcsCommandDecorator(ShellCommand *command)
|
|||||||
connect(m_command, &ShellCommand::executedAsync, this, &VcsCommandDecorator::addTask);
|
connect(m_command, &ShellCommand::executedAsync, this, &VcsCommandDecorator::addTask);
|
||||||
const auto connection = connect(m_command, &ShellCommand::runCommandFinished,
|
const auto connection = connect(m_command, &ShellCommand::runCommandFinished,
|
||||||
this, &VcsCommandDecorator::postRunCommand);
|
this, &VcsCommandDecorator::postRunCommand);
|
||||||
connect(ICore::instance(), &ICore::coreAboutToClose, this, [connection] {
|
connect(ICore::instance(), &ICore::coreAboutToClose, this, [this, connection] {
|
||||||
disconnect(connection);
|
disconnect(connection);
|
||||||
abort();
|
m_command->abort();
|
||||||
});}
|
});}
|
||||||
|
|
||||||
void VcsCommandDecorator::addTask(const QFuture<void> &future)
|
void VcsCommandDecorator::addTask(const QFuture<void> &future)
|
||||||
|
Reference in New Issue
Block a user