From: Kai Koehne <kai.koehne@nokia.com>
Date: Thu, 3 Nov 2011 08:47:08 +0000 (+0100)
Subject: Profiler: Fix profiling when disabled on startup
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=af4e1ffbc02d897fc4268771632ea400c6a6ae45;p=konrad%2Fqtdeclarative.git

Profiler: Fix profiling when disabled on startup

Don't try to call addEvent(EndTrace) if we've just received the inital
message telling us whether to profiler or not.

Change-Id: I78e7437fce46bc1eabfa0c3095ffe11f396c403e
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
---

diff --git a/src/declarative/debugger/qdeclarativedebugtrace.cpp b/src/declarative/debugger/qdeclarativedebugtrace.cpp
index bb092c1..6ccfbb3 100644
--- a/src/declarative/debugger/qdeclarativedebugtrace.cpp
+++ b/src/declarative/debugger/qdeclarativedebugtrace.cpp
@@ -267,11 +267,12 @@ void QDeclarativeDebugTrace::messageReceived(const QByteArray &message)
     QByteArray rwData = message;
     QDataStream stream(&rwData, QIODevice::ReadOnly);
 
+    bool wasEnabled = m_enabled;
     stream >> m_enabled;
 
     m_messageReceived = true;
 
-    if (!m_enabled) {
+    if (!m_enabled && wasEnabled) {
         m_enabled = true;
         addEvent(EndTrace);
         m_enabled = false;