summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2015-05-21 13:17:23 +0200
committerhjk <hjk@theqtcompany.com>2015-05-21 11:42:02 +0000
commitf35422169cea62b478d0f13744ef6ef6462f8e66 (patch)
tree96f0861ab753a1822458452ac6f796a09f6a5b04
parenta33db02a3689ce19423cb3a2c66b651f97f84d8a (diff)
downloadqt-creator-f35422169cea62b478d0f13744ef6ef6462f8e66.tar.gz
Debugger: Remove a wrong soft assert in breakpoint handler
The code path can be triggered legitimately by removing breakpoints without direct file association like "Break on throw" in the breakpoint view. Change-Id: If32a990f76d86386e40123c8f7a90613e15ca670 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
-rw-r--r--src/plugins/debugger/breakhandler.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 053813441e..7ae00161cb 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -1329,11 +1329,12 @@ BreakpointItem::~BreakpointItem()
void BreakpointItem::destroyMarker()
{
- BreakpointMarker *m = m_marker;
- QTC_ASSERT(m, return);
- m->m_bp = 0;
- m_marker = 0;
- delete m;
+ if (m_marker) {
+ BreakpointMarker *m = m_marker;
+ m->m_bp = 0;
+ m_marker = 0;
+ delete m;
+ }
}
QString BreakpointItem::markerFileName() const