diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-04-27 17:02:39 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-04-27 17:02:39 +0200 |
| commit | 9092e70884247f0d4cb276be17f5e47e5d8c148d (patch) | |
| tree | e54fd50c10e441c2824d7fb161786dcee90e9e00 /src/plugins/debugger/breakhandler.cpp | |
| parent | 6c5bec6e656d14edb0aa519a08a3c5b4e0a9c17b (diff) | |
| parent | 29062c64f7d880f15a95dbcec8d0ca6804550a54 (diff) | |
| download | qt-creator-9092e70884247f0d4cb276be17f5e47e5d8c148d.tar.gz | |
Merge remote-tracking branch 'origin/2.5'
Conflicts:
doc/templates/style/style.css
qtcreator.pri
Change-Id: I5f4f5f191726883dae18cb760733a5e8e6bd4e7d
Diffstat (limited to 'src/plugins/debugger/breakhandler.cpp')
| -rw-r--r-- | src/plugins/debugger/breakhandler.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index 140942b931..cd34c68303 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -1426,8 +1426,10 @@ bool BreakHandler::BreakpointItem::isLocatedAt void BreakHandler::BreakpointItem::updateMarkerIcon() { - marker->setIcon(icon()); - marker->updateMarker(); + if (marker) { + marker->setIcon(icon()); + marker->updateMarker(); + } } void BreakHandler::BreakpointItem::updateMarker(BreakpointModelId id) |