From 7db238c1169d6925c13014de47cbaf4beec8710f Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@theqtcompany.com>
Date: Fri, 6 Mar 2015 14:09:40 +0100
Subject: [PATCH] Cdbext: Discard old watches when syncing...

... to make sure everything is new evaluated.

Change-Id: I256e044e0095c0c4d2e4563474768ba2fdc3c85e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
---
 src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp b/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp
index f67c871424b..abe5c140438 100644
--- a/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp
+++ b/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp
@@ -507,16 +507,16 @@ static std::string commandLocals(ExtensionCommandContext &commandExtCtx,PCSTR ar
     // Synchronize watches if desired.
     WatchesSymbolGroup *watchesSymbolGroup = extCtx.watchesSymbolGroup();
     if (watchSynchronization) {
-        if (watcherInameExpressionMap.empty()) { // No watches..kill group.
-            watchesSymbolGroup = 0;
-            extCtx.discardWatchesSymbolGroup();
-            if (SymbolGroupValue::verbose)
-                DebugPrint() << "Discarding watchers";
-        } else {
+        watchesSymbolGroup = 0;
+        extCtx.discardWatchesSymbolGroup();
+        if (!watcherInameExpressionMap.empty()) {
             // Force group into existence
             watchesSymbolGroup = extCtx.watchesSymbolGroup(commandExtCtx.symbols(), errorMessage);
-            if (!watchesSymbolGroup || !watchesSymbolGroup->synchronize(commandExtCtx.symbols(), watcherInameExpressionMap, errorMessage))
+            if (!watchesSymbolGroup || !watchesSymbolGroup->synchronize(commandExtCtx.symbols(),
+                                                                        watcherInameExpressionMap,
+                                                                        errorMessage)) {
                 return std::string();
+            }
         }
     }