[layouts] Fix data defined buttons do not update when clicking

between items of same type Fixes #18637, #18639
qgis · Apr 6, 2018 · 3c08e2d · 3c08e2d
1 parent 3b8d843
commit 3c08e2d
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/gui/layout/qgslayoutitemwidget.cpp b/src/gui/layout/qgslayoutitemwidget.cpp
@@ -147,13 +147,24 @@ QgsLayoutObject *QgsLayoutItemBaseWidget::layoutObject()
 
 bool QgsLayoutItemBaseWidget::setItem( QgsLayoutItem *item )
 {
+  QgsLayoutObject *oldObject = mObject;
+  QgsLayoutConfigObject *oldConfigObject = mConfigObject;
+  // have to set new mObject/mConfigObject here, because setNewItem methods require access to them
+  mObject = item;
+  mConfigObject = new QgsLayoutConfigObject( this, mObject );
   if ( setNewItem( item ) )
   {
-    mObject = item;
+    oldConfigObject->deleteLater();
     return true;
   }
-
+  else
-  return false;
+  {
+    // revert object change since it was unsuccessful
+    mObject = oldObject;
+    mConfigObject->deleteLater();
+    mConfigObject = oldConfigObject;
+    return false;
+  }
 }
 
 void QgsLayoutItemBaseWidget::setReportTypeString( const QString & )