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

VCS: Avoid potential crash

Browse Source 
Change-Id: Iedae7965eca0c32e0868795ea7541a5064c6c4a6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2012-10-21 19:58:59 +02:00
committed by Tobias Hunger
parent ae6c5eaa0c
commit ab36bc6e8b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/vcsbase/vcsbaseplugin.cpp
View File

@@ -993,9 +993,9 @@ bool VcsBasePlugin::runFullySynchronous(const QString &workingDirectory,
return false; return false;
} }
if (!SynchronousProcess::readDataFromProcess(process, timeoutMS, if (!SynchronousProcess::readDataFromProcess(process, timeoutMS, outputText, errorText, true)) {
outputText, errorText, true)) { if (errorText)
errorText->append(tr("Error: Executable timed out after %1s.").arg(timeoutMS / 1000).toLocal8Bit()); errorText->append(tr("Error: Executable timed out after %1s.").arg(timeoutMS / 1000).toLocal8Bit());
SynchronousProcess::stopProcess(process); SynchronousProcess::stopProcess(process);
return false; return false;
} }