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

Debugger: use inferior device when run tool device is null

Browse Source 
Task-number: QTCREATORBUG-19442
Change-Id: I6c2419b30bf86af79bb2436dc6dc8196f6c65f06
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2017-12-12 09:03:45 +01:00
committed by hjk
parent aaa65375f9
commit 1772808592
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -759,7 +759,11 @@ void GdbEngine::interruptInferior()
showMessage("TRYING TO INTERRUPT INFERIOR"); showMessage("TRYING TO INTERRUPT INFERIOR");
if (HostOsInfo::isWindowsHost() && !m_isQnxGdb) { if (HostOsInfo::isWindowsHost() && !m_isQnxGdb) {
QTC_ASSERT(state() == InferiorStopRequested, qDebug() << state(); notifyInferiorStopFailed()); QTC_ASSERT(state() == InferiorStopRequested, qDebug() << state(); notifyInferiorStopFailed());
DeviceProcessSignalOperation::Ptr signalOperation = runTool()->device()->signalOperation(); IDevice::ConstPtr device = runTool()->device();
if (!device)
device = runParameters().inferior.device;
QTC_ASSERT(device, notifyInferiorStopFailed(); return);
DeviceProcessSignalOperation::Ptr signalOperation = device->signalOperation();
QTC_ASSERT(signalOperation, notifyInferiorStopFailed(); return); QTC_ASSERT(signalOperation, notifyInferiorStopFailed(); return);
connect(signalOperation.data(), &DeviceProcessSignalOperation::finished, connect(signalOperation.data(), &DeviceProcessSignalOperation::finished,
this, [this, signalOperation](const QString &error) { this, [this, signalOperation](const QString &error) {