From 00cd7266084daba72550b27b4028e4a3a2c6e8ab Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Mon, 1 Aug 2016 16:00:07 +0200
Subject: [PATCH] Debugger: Add more safety net for failing dumper

In case a dumper explicitly reports the presence of children
but fails to extract them, remove the model's desire to
see them by re-setting the 'wantsChildren' hint explicitly
after a full update.

Change-Id: I09d3d3dd67067d22d39f7685b57570ecb42984d2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/debugger/watchhandler.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 8387f3f2e9a..0215e7c94cc 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -1379,6 +1379,13 @@ void WatchHandler::notifyUpdateFinished()
     foreach (auto item, toRemove)
         m_model->destroyItem(item);
 
+    m_model->forAllItems([this](WatchItem *item) {
+        if (item->wantsChildren && isExpandedIName(item->iname)) {
+            m_model->m_engine->showMessage(QString("ADJUSTING CHILD EXPECTATION FOR " + item->iname));
+            item->wantsChildren = false;
+        }
+    });
+
     m_model->m_contentsValid = true;
     updateWatchersWindow();
     m_model->reexpandItems();