forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -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()));
|
||||
|
||||
Reference in New Issue
Block a user