From 6929d66ff23d9a84b6e1d425dcf234192f3ce9bc Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Tue, 28 Sep 2010 12:59:29 +0200
Subject: [PATCH] QmlObserver: Prevent messages from being sent if there is no
 server side

Actually this is fixed in QDeclarativeService::sendMessage, too, but the
fix won't be part of 4.7.1, so better double-check.

Reviewed-by: Christiaan Janssen
---
 .../qmljsdebugger/include/qdeclarativeobserverservice.h   | 2 ++
 .../qml/qmljsdebugger/qdeclarativeobserverservice.cpp     | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h
index 0711348bbec..66084cd92c4 100644
--- a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h
@@ -70,6 +70,8 @@ public:
     void reloaded();
     QString idStringForObject(QObject *obj) const;
 
+    void sendMessage(const QByteArray &message);
+
 public Q_SLOTS:
     void selectedColorChanged(const QColor &color);
     void contextPathUpdated(const QStringList &contextPath);
diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp b/share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp
index 0b79609551f..114cd15cf6c 100644
--- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp
@@ -236,4 +236,12 @@ QString QDeclarativeObserverService::idStringForObject(QObject *obj) const
     return idString;
 }
 
+void QDeclarativeObserverService::sendMessage(const QByteArray &message)
+{
+    if (status() != Enabled)
+        return;
+
+    QDeclarativeDebugService::sendMessage(message);
+}
+
 } // namespace QmlJSDebugger