aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2017-08-17 10:15:46 +0200
committerhjk <hjk@qt.io>2017-08-17 09:01:20 +0000
commitef1b0f999df0c7e817f30f1d80406b1d4471c6a6 (patch)
tree5aac8d53f95538fa175738e81072f3b404a994ff
parent2f762508b03d6729c7741d637ea77eb8f851b5ff (diff)
Debugger: Fix assert handling for devices without signalOperation()
That's not a full solution, but fixes the reported crash. The core of the problem is that BareMetal devices do not provide signalOperation() (which is ok) and this code path should not have been taken to start with. Change-Id: Ib903b8d7f0728c5b3cb217b567247e66b751c5c3 Task-number: QTCREATORBUG-18694 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--src/plugins/debugger/gdb/gdbengine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index fd3f8892f3..a49f469b87 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -800,7 +800,7 @@ void GdbEngine::interruptInferior()
QTC_ASSERT(state() == InferiorStopRequested, qDebug() << state(); notifyInferiorStopFailed());
QTC_ASSERT(!m_signalOperation, notifyInferiorStopFailed());
m_signalOperation = runTool()->device()->signalOperation();
- QTC_ASSERT(m_signalOperation, notifyInferiorStopFailed());
+ QTC_ASSERT(m_signalOperation, notifyInferiorStopFailed(); return);
connect(m_signalOperation.data(), &DeviceProcessSignalOperation::finished,
this, &GdbEngine::handleInterruptDeviceInferior);