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

Perforce: Fix soft assertion

Browse Source 
Fixes: QTCREATORBUG-18404
Change-Id: I274f8cbc4512c5142d54a3b4faf39747bfa16bd8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2019-01-11 09:45:51 +02:00
committed by Orgad Shaneh
parent 44674117a5
commit 667e622d5f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/perforce/perforceplugin.cpp
View File

@@ -966,7 +966,8 @@ PerforceResponse PerforcePlugin::synchronousProcess(const QString &workingDir,
SynchronousProcess process;
const int timeOutS = (flags & LongTimeOut) ? settings().longTimeOutS() : settings().timeOutS();
process.setTimeoutS(timeOutS);
process.setCodec(outputCodec);
if (outputCodec)
process.setCodec(outputCodec);
if (flags & OverrideDiffEnvironment)
process.setProcessEnvironment(overrideDiffEnvironmentVariable());
if (!workingDir.isEmpty())