feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

External Tools: Unexpect file change in any case

Browse Source 
... when the tool has finished.

Change-Id: Ia3c03d083efd605d3f75a7246c1e03592656d04b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
David Schulz
2013-08-07 13:15:15 +02:00
parent e1fb42d94d
commit 160bd09622
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/coreplugin/externaltool.cpp
View File

@@ -624,14 +624,13 @@ void ExternalToolRunner::started()
void ExternalToolRunner::finished(int exitCode, QProcess::ExitStatus status) void ExternalToolRunner::finished(int exitCode, QProcess::ExitStatus status)
{ {
if (status == QProcess::NormalExit && exitCode == 0) { if (status == QProcess::NormalExit && exitCode == 0
if (m_tool->outputHandling() == ExternalTool::ReplaceSelection && (m_tool->outputHandling() == ExternalTool::ReplaceSelection
|| m_tool->errorHandling() == ExternalTool::ReplaceSelection) { || m_tool->errorHandling() == ExternalTool::ReplaceSelection)) {
emit ExternalToolManager::instance()->replaceSelectionRequested(m_processOutput); emit ExternalToolManager::instance()->replaceSelectionRequested(m_processOutput);
}
if (m_tool->modifiesCurrentDocument())
DocumentManager::unexpectFileChange(m_expectedFileName);
} }
if (m_tool->modifiesCurrentDocument())
DocumentManager::unexpectFileChange(m_expectedFileName);
ICore::messageManager()->printToOutputPane( ICore::messageManager()->printToOutputPane(
tr("'%1' finished").arg(m_resolvedExecutable), MessageManager::Silent); tr("'%1' finished").arg(m_resolvedExecutable), MessageManager::Silent);
deleteLater(); deleteLater();