From 2e03531bfb27fe4072d9d33b3ae422bba1c8c09b Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@nokia.com>
Date: Thu, 24 Nov 2011 13:14:21 +0100
Subject: QDeclarativeDebugService: Crash fix

Query for serviceNames in registerService.

Change-Id: I570bd68c424cec696ca813a7fa1b485b64e328a4
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
---
 src/declarative/debugger/qdeclarativedebugservice.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/declarative/debugger/qdeclarativedebugservice.cpp')

diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp
index 0a997aa2fe..2bdcf2ff92 100644
--- a/src/declarative/debugger/qdeclarativedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativedebugservice.cpp
@@ -61,10 +61,7 @@ QDeclarativeDebugService::QDeclarativeDebugService(const QString &name, QObject
     d->server = QDeclarativeDebugServer::instance();
     d->status = QDeclarativeDebugService::NotConnected;
 
-    if (d->server->serviceNames().contains(d->name)) {
-        qWarning() << "QDeclarativeDebugService: Conflicting plugin name" << d->name;
-        d->server = 0;
-    }
+
 }
 
 QDeclarativeDebugService::QDeclarativeDebugService(QDeclarativeDebugServicePrivate &dd,
@@ -87,7 +84,12 @@ QDeclarativeDebugService::Status QDeclarativeDebugService::registerService()
     if (!d->server)
         return NotConnected;
 
-    d->server->addService(this);
+    if (d->server->serviceNames().contains(d->name)) {
+        qWarning() << "QDeclarativeDebugService: Conflicting plugin name" << d->name;
+        d->server = 0;
+    } else {
+        d->server->addService(this);
+    }
     return status();
 }
 
-- 
cgit v1.2.3