From c76ddfc489c60214b271fb6abf2caec72544a7e9 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 12 Oct 2012 15:01:27 +0200 Subject: [PATCH] QmlDesigner.Instances: crash fix During destruction both new parent and old parent are invalid. The intPositioner flag is not updated (isInPositioner()) and we crash. The check for parentInstance() avoids this. Change-Id: I5224c58bb461956f7ce2c47349650913975aa836 Reviewed-by: Marco Bubke --- .../qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp index 472cae669ee..a93bae323c7 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp @@ -505,7 +505,7 @@ void QuickItemNodeInstance::reparent(const ObjectNodeInstance::Pointer &oldParen refresh(); DesignerSupport::updateDirtyNode(quickItem()); - if (isInPositioner()) + if (parentInstance() && isInPositioner()) parentInstance()->refreshPositioner(); }