From 160bd09622015e25613ca752a2ed0c5fc68c2b98 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 7 Aug 2013 13:15:15 +0200 Subject: [PATCH] External Tools: Unexpect file change in any case ... when the tool has finished. Change-Id: Ia3c03d083efd605d3f75a7246c1e03592656d04b Reviewed-by: Eike Ziller --- src/plugins/coreplugin/externaltool.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp index 664cbef66f4..471977eee67 100644 --- a/src/plugins/coreplugin/externaltool.cpp +++ b/src/plugins/coreplugin/externaltool.cpp @@ -624,14 +624,13 @@ void ExternalToolRunner::started() void ExternalToolRunner::finished(int exitCode, QProcess::ExitStatus status) { - if (status == QProcess::NormalExit && exitCode == 0) { - if (m_tool->outputHandling() == ExternalTool::ReplaceSelection - || m_tool->errorHandling() == ExternalTool::ReplaceSelection) { - emit ExternalToolManager::instance()->replaceSelectionRequested(m_processOutput); - } - if (m_tool->modifiesCurrentDocument()) - DocumentManager::unexpectFileChange(m_expectedFileName); + if (status == QProcess::NormalExit && exitCode == 0 + && (m_tool->outputHandling() == ExternalTool::ReplaceSelection + || m_tool->errorHandling() == ExternalTool::ReplaceSelection)) { + emit ExternalToolManager::instance()->replaceSelectionRequested(m_processOutput); } + if (m_tool->modifiesCurrentDocument()) + DocumentManager::unexpectFileChange(m_expectedFileName); ICore::messageManager()->printToOutputPane( tr("'%1' finished").arg(m_resolvedExecutable), MessageManager::Silent); deleteLater();