feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Fix startup with core files

Browse Source 
Change-Id: I1dfb444543634839deb36d50609f1dc23d235717
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2016-01-28 17:58:53 +01:00
parent 66bdd60947
commit 3d82198031
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -324,14 +324,21 @@ void DebuggerRunControlCreator::initialize(const DebuggerStartParameters &sp)
void DebuggerRunControlCreator::enrich(const RunConfiguration *runConfig, const Kit *kit)
{
QTC_ASSERT(!m_kit, return);
QTC_ASSERT(!m_target, return);
QTC_ASSERT(!m_runConfig, return);
// Find RunConfiguration.
if (!m_runConfig)
m_runConfig = runConfig;
m_kit = kit;
m_runConfig = runConfig;
// Find a Kit and Target. Either could be missing.
if (m_runConfig)
m_target = m_runConfig->target();
if (!m_kit && m_target)
m_kit = m_target->kit();
// Extract as much as possible from available RunConfiguration.
if (m_runConfig->runnable().is<StandardRunnable>()) {
if (m_runConfig && m_runConfig->runnable().is<StandardRunnable>()) {
auto runnable = m_runConfig->runnable().as<StandardRunnable>();
m_rp.inferior.executable = runnable.executable;
m_rp.inferior.commandLineArguments = runnable.commandLineArguments;
@@ -340,18 +347,6 @@ void DebuggerRunControlCreator::enrich(const RunConfiguration *runConfig, const
m_rp.inferior.workingDirectory = FileUtils::normalizePathName(runnable.workingDirectory);
}
// Find a Kit and Target. Either could be missing.
if (m_runConfig)
m_target = m_runConfig->target();
if (!m_kit)
m_kit = kit;
if (!m_kit) {
if (m_target)
m_kit = m_target->kit();
}
// We might get an executable from a local PID.
if (m_rp.inferior.executable.isEmpty() && m_rp.attachPID != InvalidPid) {
foreach (const DeviceProcessItem &p, DeviceProcessList::localProcesses())