From 667e622d5fd96cb1bb075ebd108fc99abd612ceb Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Fri, 11 Jan 2019 09:45:51 +0200
Subject: Perforce: Fix soft assertion

Fixes: QTCREATORBUG-18404
Change-Id: I274f8cbc4512c5142d54a3b4faf39747bfa16bd8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/perforce/perforceplugin.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/plugins/perforce')

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())
-- 
cgit v1.2.3