From eef08c0b91e752d12cd028ccb9082e86e57250b2 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Wed, 23 Feb 2011 19:18:51 +0100
Subject: [PATCH] QmlDesigner.NodeInstances: Check if context is not null

---
 .../qmldesigner/designercore/instances/objectnodeinstance.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp
index 45778b40881..3193f29cc83 100644
--- a/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp
@@ -161,11 +161,11 @@ void ObjectNodeInstance::initializePropertyWatcher(const ObjectNodeInstance::Poi
 
 void ObjectNodeInstance::setId(const QString &id)
 {
-    if (!m_id.isEmpty()) {
+    if (!m_id.isEmpty() && context()) {
         context()->engine()->rootContext()->setContextProperty(m_id, 0);
     }
 
-    if (!id.isEmpty()) {
+    if (!id.isEmpty() && context()) {
         context()->engine()->rootContext()->setContextProperty(id, object()); // will also force refresh of all bindings
     }