diff options
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 5c43f443201..ddce1bced8c 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()) |