diff options
| author | hjk <hjk@qt.io> | 2022-06-16 10:17:33 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2022-06-16 08:26:10 +0000 |
| commit | 152b14207ce264222557665c568907931e9277d8 (patch) | |
| tree | bbebe25943bab6fdc39d3e661b70febda4d79ea5 /src/plugins/coreplugin/patchtool.cpp | |
| parent | bfad59ade006fd704439c229bbb37ffc560cd243 (diff) | |
Replace QtcProcess::stopProcess() by stop() plus waitForFinished
... or nothing, if the process object is destroyed immediately.
Change-Id: I6a1e1928bc49fc20a1c0e0ee9b8f4f723276bbca
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/plugins/coreplugin/patchtool.cpp')
| -rw-r--r-- | src/plugins/coreplugin/patchtool.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/patchtool.cpp b/src/plugins/coreplugin/patchtool.cpp index f49185ea0ef..d26fcba6c08 100644 --- a/src/plugins/coreplugin/patchtool.cpp +++ b/src/plugins/coreplugin/patchtool.cpp @@ -112,7 +112,8 @@ static bool runPatchHelper(const QByteArray &input, const FilePath &workingDirec QByteArray stdOut; QByteArray stdErr; if (!patchProcess.readDataFromProcess(30, &stdOut, &stdErr, true)) { - patchProcess.stopProcess(); + patchProcess.stop(); + patchProcess.waitForFinished(); MessageManager::writeFlashing( QApplication::translate("Core::PatchTool", "A timeout occurred running \"%1\"") .arg(patch.toUserOutput())); |