Commit ab36bc6e authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Tobias Hunger

VCS: Avoid potential crash

Change-Id: Iedae7965eca0c32e0868795ea7541a5064c6c4a6
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent ae6c5eaa
......@@ -993,9 +993,9 @@ bool VcsBasePlugin::runFullySynchronous(const QString &workingDirectory,
return false;
}
if (!SynchronousProcess::readDataFromProcess(process, timeoutMS,
outputText, errorText, true)) {
errorText->append(tr("Error: Executable timed out after %1s.").arg(timeoutMS / 1000).toLocal8Bit());
if (!SynchronousProcess::readDataFromProcess(process, timeoutMS, outputText, errorText, true)) {
if (errorText)
errorText->append(tr("Error: Executable timed out after %1s.").arg(timeoutMS / 1000).toLocal8Bit());
SynchronousProcess::stopProcess(process);
return false;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment