Debugger: Fix core file loading

Amends 99e3635ef.

Change-Id: I0146416af32a6464765de008630ca1a1a05231a7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 3 insertions, 4 deletions

diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 0f4908b4d0..60936917ff 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -903,17 +903,16 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit, bool allowTer
     m_runParameters.sysRoot = SysRootKitInformation::sysRoot(kit).toString();
     m_runParameters.macroExpander = kit->macroExpander();
     m_runParameters.debugger = DebuggerKitInformation::runnable(kit);
+    m_runParameters.cppEngineType = DebuggerKitInformation::engineType(kit);
 
     if (QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(kit))
         m_runParameters.qtPackageSourceLocation = qtVersion->qtPackageSourcePath().toString();
 
     if (auto aspect = runConfig ? runConfig->extraAspect<DebuggerRunConfigurationAspect>() : nullptr) {
-        if (aspect->useCppDebugger())
-            m_runParameters.cppEngineType = DebuggerKitInformation::engineType(kit);
+        if (!aspect->useCppDebugger())
+            m_runParameters.cppEngineType = NoEngineType;
         m_runParameters.isQmlDebugging = aspect->useQmlDebugger();
         m_runParameters.multiProcess = aspect->useMultiProcess();
-    } else if (m_runParameters.isCppDebugging()) {
-        m_runParameters.cppEngineType = DebuggerKitInformation::engineType(kit);
     }
 
     m_runParameters.inferior = runnable();