diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2015-01-30 15:03:45 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-02-02 12:10:18 +0000 |
| commit | 09ad56a67b8c0ff4fbf78c802450c51646b11021 (patch) | |
| tree | ac8554f1957ccdc3abf484b547d090487d67544a | |
| parent | 40ba5f947bd489002430d7ae2bef62cd403cdeac (diff) | |
| download | qt-creator-09ad56a67b8c0ff4fbf78c802450c51646b11021.tar.gz | |
V8Debugger: Don't send watcher requests if qml engine has not stopped
This fixes a regression introduced in a8ebf535b829dac. We shouldn't
send watcher evaluation commands while the QML engine hasn't actually
stopped, because this might lead to an assert on the server side.
Task-number: QTCREATORBUG-13916
Change-Id: I300e2f73c0a1a03e0e6187a5357abeba408f72a0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
| -rw-r--r-- | src/plugins/debugger/qml/qmlv8debuggerclient.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp index f4c0816450..c28166ef26 100644 --- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp +++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp @@ -954,6 +954,9 @@ void QmlV8DebuggerClient::executeDebuggerCommand(const QString &command) void QmlV8DebuggerClient::synchronizeWatchers(const QStringList &watchers) { SDEBUG(watchers); + if (d->engine->state() != InferiorStopOk) + return; + foreach (const QString &exp, watchers) { StackHandler *stackHandler = d->engine->stackHandler(); if (stackHandler->isContentsValid() && stackHandler->currentFrame().isUsable()) { |