diff options
| author | David Schulz <david.schulz@digia.com> | 2013-08-07 13:15:15 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@digia.com> | 2013-09-24 15:38:41 +0200 |
| commit | 160bd09622015e25613ca752a2ed0c5fc68c2b98 (patch) | |
| tree | f35dd62e0a5eb30452ac08a4e45c0f333bb16dbe | |
| parent | e1fb42d94db2a1f249a7ffc85ab8f8a2744ac0d8 (diff) | |
| download | qt-creator-160bd09622015e25613ca752a2ed0c5fc68c2b98.tar.gz | |
External Tools: Unexpect file change in any case
... when the tool has finished.
Change-Id: Ia3c03d083efd605d3f75a7246c1e03592656d04b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| -rw-r--r-- | src/plugins/coreplugin/externaltool.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp index 664cbef66f..471977eee6 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(); |