From e2e843a30d11d94685220dc54e452771382ade12 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 11 Apr 2017 13:34:33 +0200 Subject: [PATCH] ProjectExplorer: Move default runnable setting ... to where it belongs, guarded by a check of RunConfigartion presence Change-Id: Ie2bfdea30fded81f12a6962c9717c8574fc14ba5 Reviewed-by: Christian Stenger --- src/plugins/projectexplorer/runconfiguration.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 2d0afcc20a2..1c6fef9bd87 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -523,6 +523,7 @@ public: : q(parent), runMode(mode), runConfiguration(runConfiguration) { if (runConfiguration) { + runnable = runConfiguration->runnable(); displayName = runConfiguration->displayName(); outputFormatter = runConfiguration->createOutputFormatter(); device = DeviceKitInformation::device(runConfiguration->target()->kit()); @@ -604,7 +605,6 @@ using namespace Internal; RunControl::RunControl(RunConfiguration *runConfiguration, Core::Id mode) : d(new RunControlPrivate(this, runConfiguration, mode)) { - d->runnable = runConfiguration->runnable(); #ifdef WITH_JOURNALD JournaldWatcher::instance()->subscribe(this, [this](const JournaldWatcher::LogEntry &entry) { if (entry.value("_MACHINE_ID") != JournaldWatcher::instance()->machineId())