Utils: Combine startStubProcess parameters

Change-Id: Ic0515a3864687494bd1e280a82b91a5bafef46b1
Reviewed-by: Christian Stenger <[email protected]>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/libs/utils/terminalinterface.cpp b/src/libs/utils/terminalinterface.cpp
index bb193b4d98d..6972184e325 100644
--- a/src/libs/utils/terminalinterface.cpp
+++ b/src/libs/utils/terminalinterface.cpp
@@ -304,9 +304,7 @@ void TerminalInterface::start()
         expected_str<qint64> result;
         QMetaObject::invokeMethod(
             d->stubCreator,
-            [this, &result] {
-                result = d->stubCreator->startStubProcess(m_setup.m_commandLine, m_setup);
-            },
+            [this, &result] { result = d->stubCreator->startStubProcess(m_setup); },
             d->stubCreator->thread() == QThread::currentThread() ? Qt::DirectConnection
                                                                  : Qt::BlockingQueuedConnection);
 
@@ -386,9 +384,12 @@ void TerminalInterface::start()
 
     QTC_ASSERT(d->stubCreator, return);
 
+    ProcessSetupData stubSetupData = m_setup;
+    stubSetupData.m_commandLine = cmd;
+
     QMetaObject::invokeMethod(
         d->stubCreator,
-        [cmd, this] { d->stubCreator->startStubProcess(cmd, m_setup); },
+        [stubSetupData, this] { d->stubCreator->startStubProcess(stubSetupData); },
         d->stubCreator->thread() == QThread::currentThread() ? Qt::DirectConnection
                                                              : Qt::BlockingQueuedConnection);