diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-01-11 09:45:51 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2019-01-11 11:51:03 +0000 |
| commit | 667e622d5fd96cb1bb075ebd108fc99abd612ceb (patch) | |
| tree | 3dcdbb393d6a7c694d5df4e1c48bae5a47beac87 /src/plugins/perforce | |
| parent | 44674117a58aabb98c8468641615362294ac79cb (diff) | |
Perforce: Fix soft assertion
Fixes: QTCREATORBUG-18404
Change-Id: I274f8cbc4512c5142d54a3b4faf39747bfa16bd8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/perforce')
| -rw-r--r-- | src/plugins/perforce/perforceplugin.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index 5c43f44320..ddce1bced8 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -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()) |