Allow QDeclarativeIncubator to be deleted within statusChanged() callback

Change-Id: I17621870b67d8a975545adc27ddaf9695e6a9428
Reviewed-by: Martin Jones <martin.jones@nokia.com>

1 files changed, 11 insertions, 4 deletions

diff --git a/src/declarative/qml/qdeclarativeincubator.cpp b/src/declarative/qml/qdeclarativeincubator.cpp
index d1afac2d13..05c73da3a2 100644
--- a/src/declarative/qml/qdeclarativeincubator.cpp
+++ b/src/declarative/qml/qdeclarativeincubator.cpp
@@ -83,15 +83,22 @@ void QDeclarativeEnginePrivate::incubate(QDeclarativeIncubator &i, QDeclarativeC
 
     inProgressCreations++;
 
-    p->changeStatus(QDeclarativeIncubator::Loading);
-
     if (mode == QDeclarativeIncubator::Synchronous) {
-        QDeclarativeVME::Interrupt i;
-        p->incubate(i);
+        typedef QDeclarativeIncubatorPrivate IP;
+        QRecursionWatcher<IP, &IP::recursion> watcher(p);
+
+        p->changeStatus(QDeclarativeIncubator::Loading);
+
+        if (!watcher.hasRecursed()) {
+            QDeclarativeVME::Interrupt i;
+            p->incubate(i);
+        }
     } else {
         incubatorList.insert(p);
         incubatorCount++;
 
+        p->changeStatus(QDeclarativeIncubator::Loading);
+
         if (incubationController)
             incubationController->incubatingObjectCountChanged(incubatorCount);
     }