Fix items are removed from scene twice

qgis · Oct 6, 2017 · b04c101 · b04c101
1 parent 5796b89
commit b04c101
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/core/layout/qgslayout.cpp b/src/core/layout/qgslayout.cpp
@@ -473,7 +473,11 @@ void QgsLayout::addLayoutItemPrivate( QgsLayoutItem *item )
 void QgsLayout::removeLayoutItemPrivate( QgsLayoutItem *item )
 {
   mItemsModel->setItemRemoved( item );
-  removeItem( item );
+  // small chance that item is still in a scene - the model may have
+  // rejected the removal for some reason. This is probably not necessary,
+  // but can't hurt...
+  if ( item->scene() )
+    removeItem( item );
 #if 0 //TODO
   emit itemRemoved( item );
 #endif