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

Debugger: Remove some soft asserts

Browse Source 
They can legitimately appear in regular use right now.

Task-number: QTCREATORBUG-13938
Change-Id: Id7097c82866375060545db6ddbbecbf1fbf5da6d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2015-03-03 10:01:50 +01:00
parent 49fa8afcb9
commit 518a44a780
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/debugger/watchhandler.cpp
View File

@@ -621,7 +621,9 @@ bool WatchItem::canFetchMore() const
void WatchItem::fetchMore() void WatchItem::fetchMore()
{ {
QTC_ASSERT(!fetchTriggered, return); if (fetchTriggered)
return;
watchModel()->m_expandedINames.insert(d.iname); watchModel()->m_expandedINames.insert(d.iname);
fetchTriggered = true; fetchTriggered = true;
if (children().isEmpty()) { if (children().isEmpty()) {
@@ -1246,9 +1248,15 @@ void WatchModel::insertItem(WatchItem *item)
void WatchModel::reexpandItems() void WatchModel::reexpandItems()
{ {
foreach (const QByteArray &iname, m_expandedINames) { foreach (const QByteArray &iname, m_expandedINames) {
WatchItem *item = findItem(iname); if (WatchItem *item = findItem(iname)) {
emit itemIsExpanded(indexFromItem(item)); emit itemIsExpanded(indexFromItem(item));
emit inameIsExpanded(iname); emit inameIsExpanded(iname);
} else {
// Can happen. We might have stepped into another frame
// not containing that iname, but we still like to
// remember the expanded state of iname in case we step
// out of the frame again.
}
} }
} }