Debugger: Delay evaluation of stub runnable environment

There can be modifications in the environment between the decision
to use a terminal and its start. We want them taken into account.

Change-Id: I5622614c5fac3bdd8167c29e7b618b5e42a28287
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-03-09 11:53:18 +01:00
parent aa96b07853
commit 3560a86c2e
3 changed files with 14 additions and 11 deletions

View File

@@ -394,7 +394,8 @@ void DebuggerRunTool::setUseTerminal(bool on)
&& debuggerSettings()->useCdbConsole.value();
if (on && !d->terminalRunner && !useCdbConsole) {
d->terminalRunner = new TerminalRunner(runControl(), m_runParameters.inferior);
d->terminalRunner =
new TerminalRunner(runControl(), [this] { return m_runParameters.inferior; });
d->terminalRunner->setRunAsRoot(m_runParameters.runAsRoot);
addStartDependency(d->terminalRunner);
}