Fix effect preview picture not set when effect widget is opened in di…

…alog mode Also fix a memory leak when opened in dialog mode Fixes #33600
qgis · Jan 6, 2020 · 8a9a174 · 8a9a174
1 parent cf6cd48
commit 8a9a174
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/gui/effects/qgseffectstackpropertieswidget.cpp b/src/gui/effects/qgseffectstackpropertieswidget.cpp
@@ -470,22 +470,27 @@ void QgsEffectStackCompactWidget::showDialog()
     return;
 
   QgsEffectStack *clone = mStack->clone();
-  QgsEffectStackPropertiesWidget *widget = new QgsEffectStackPropertiesWidget( clone, nullptr );
-  if ( mPreviewPicture )
-  {
-    widget->setPreviewPicture( *mPreviewPicture );
-  }
-
   QgsPanelWidget *panel = QgsPanelWidget::findParentPanel( qobject_cast< QWidget * >( parent() ) );
   if ( panel && panel->dockMode() )
   {
+    QgsEffectStackPropertiesWidget *widget = new QgsEffectStackPropertiesWidget( clone, nullptr );
+    if ( mPreviewPicture )
+    {
+      widget->setPreviewPicture( *mPreviewPicture );
+    }
+
     connect( widget, &QgsPanelWidget::widgetChanged, this, &QgsEffectStackCompactWidget::updateEffectLive );
     connect( widget, &QgsPanelWidget::panelAccepted, this, &QgsEffectStackCompactWidget::updateAcceptWidget );
     panel->openPanel( widget );
   }
   else
   {
     QgsEffectStackPropertiesDialog dlg( clone, this );
+    if ( mPreviewPicture )
+    {
+      dlg.setPreviewPicture( *mPreviewPicture );
+    }
+
     if ( dlg.exec() == QDialog::Accepted )
     {
       *mStack = *clone;