Don't need to update visibility and enabled if the item is destructing

This actually caused a crash, since we would call the pure
virtual boundingRect() function in setVisibleHelper(). (The 'update'
argument was set to true.)

Reviewed-by: andreas

1 files changed, 9 insertions, 8 deletions

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 11a37f5..c5f5889 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -854,15 +854,16 @@ void QGraphicsItemPrivate::setParentItemHelper(QGraphicsItem *newParent, bool de
         updateAncestorFlag(QGraphicsItem::ItemClipsChildrenToShape);
         updateAncestorFlag(QGraphicsItem::ItemIgnoresTransformations);
 
-        // Update item visible / enabled.
-        if (!visible && !explicitlyHidden)
-            setVisibleHelper(true, /* explicit = */ false);
-        if (!enabled && !explicitlyDisabled)
-            setEnabledHelper(true, /* explicit = */ false);
-
-        // If the item is being deleted, the whole scene will be updated.
-        if (!deleting)
+        if (!deleting) {
+            // Update item visible / enabled.
+            if (!visible && !explicitlyHidden)
+                setVisibleHelper(true, /* explicit = */ false);
+            if (!enabled && !explicitlyDisabled)
+                setEnabledHelper(true, /* explicit = */ false);
+
+            // If the item is being deleted, the whole scene will be updated.
             updateHelper();
+        }
     }
 
     if (scene) {