Check if maskingWidget has been populated to effectively apply the ch…

…ange. Should fix issue #37473.
qgis · Jul 13, 2020 · fb9d158 · fb9d158
1 parent f5b56e3
commit fb9d158
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/gui/qgsmaskingwidget.cpp b/src/gui/qgsmaskingwidget.cpp
@@ -332,3 +332,8 @@ void QgsMaskingWidget::apply()
     layer->triggerRepaint();
   }
 }
+
+bool QgsMaskingWidget::hasBeenPopulated()
+{
+  return mMustPopulate == false;
+}
diff --git a/src/gui/qgsmaskingwidget.h b/src/gui/qgsmaskingwidget.h
@@ -47,6 +47,8 @@ class GUI_EXPORT QgsMaskingWidget: public QgsPanelWidget, private Ui::QgsMasking
     //! Applies the changes
     void apply();
 
+    bool hasBeenPopulated();
+
   signals:
     //! Emitted when a change is performed
     void widgetChanged();

diff --git a/src/gui/vector/qgsvectorlayerproperties.cpp b/src/gui/vector/qgsvectorlayerproperties.cpp
@@ -607,7 +607,7 @@ void QgsVectorLayerProperties::apply()
   mMetadataFilled = false;
 
   // save masking settings
-  if ( mMaskingWidget )
+  if ( mMaskingWidget && mMaskingWidget->hasBeenPopulated() )
     mMaskingWidget->apply();
 
   //