Debugger: Move watchHandler()->notifyUpdateStarted() to doUpdateLocals

This was it also gets triggered when expanding tooltips.

Change-Id: I90ad39e9e82abdcd40e663b4ba4998205563009b
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>

4 files changed, 7 insertions, 1 deletions

diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 0efe405fc1..52c9b952ff 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -1341,6 +1341,9 @@ void CdbEngine::doUpdateLocals(const UpdateParameters &updateParameters)
         watchHandler()->removeAllData();
         return;
     }
+
+    watchHandler()->notifyUpdateStarted();
+
     /* Watchers: Forcibly discard old symbol group as switching from
      * thread 0/frame 0 -> thread 1/assembly -> thread 0/frame 0 will otherwise re-use it
      * and cause errors as it seems to go 'stale' when switching threads.
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index f3fd3bfa84..9f68494136 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -1551,7 +1551,6 @@ void DebuggerEngine::createSnapshot()
 void DebuggerEngine::updateLocals()
 {
     watchHandler()->resetValueCache();
-    watchHandler()->notifyUpdateStarted();
     doUpdateLocals(UpdateParameters());
 }
 
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index a2380d3bc6..b3a137a649 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4660,6 +4660,8 @@ void GdbEngine::doUpdateLocals(const UpdateParameters &params)
 {
     m_pendingBreakpointRequests = 0;
 
+    watchHandler()->notifyUpdateStarted();
+
     DebuggerCommand cmd("showData");
     watchHandler()->appendFormatRequests(&cmd);
 
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index f7730df232..6a5e21df9e 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -864,6 +864,8 @@ void LldbEngine::doUpdateLocals(const UpdateParameters &params)
         return;
     }
 
+    watchHandler()->notifyUpdateStarted();
+
     DebuggerCommand cmd("updateData");
     cmd.arg("nativeMixed", isNativeMixedActive());
     watchHandler()->appendFormatRequests(&cmd);