[processing] Fix crashes when running algs in "in place" mode

Fixes #35844
qgis · Apr 20, 2020 · 60f40f0 · 60f40f0
1 parent 003ab16
commit 60f40f0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/python/plugins/processing/gui/AlgorithmDialog.py b/python/plugins/processing/gui/AlgorithmDialog.py
@@ -58,7 +58,7 @@ def __init__(self, alg, in_place=False, parent=None):
 
         self.feedback_dialog = None
         self.in_place = in_place
-        self.active_layer = None
+        self.active_layer = iface.activeLayer() if self.in_place else None
 
         self.context = None
         self.feedback = None
@@ -72,7 +72,6 @@ def __init__(self, alg, in_place=False, parent=None):
             self.buttonBox().addButton(self.runAsBatchButton,
                                        QDialogButtonBox.ResetRole)  # reset role to ensure left alignment
         else:
-            self.active_layer = iface.activeLayer()
             self.runAsBatchButton = None
             has_selection = self.active_layer and (self.active_layer.selectedFeatureCount() > 0)
             self.buttonBox().button(QDialogButtonBox.Ok).setText(
@@ -86,6 +85,7 @@ def __init__(self, alg, in_place=False, parent=None):
 
     def getParametersPanel(self, alg, parent):
         panel = ParametersPanel(parent, alg, self.in_place)
+        panel.active_layer = self.active_layer
         return panel
 
     def runAsBatch(self):

diff --git a/python/plugins/processing/gui/ParametersPanel.py b/python/plugins/processing/gui/ParametersPanel.py
@@ -48,6 +48,7 @@ class ParametersPanel(QgsProcessingParametersWidget):
     def __init__(self, parent, alg, in_place=False):
         super().__init__(alg, parent)
         self.in_place = in_place
+        self.active_layer = None
 
         self.wrappers = {}
 

diff --git a/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp b/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp
@@ -5399,12 +5399,13 @@ void QgsProcessingMapLayerWidgetWrapper::setWidgetContext( const QgsProcessingPa
 
 void QgsProcessingMapLayerWidgetWrapper::setWidgetValue( const QVariant &value, QgsProcessingContext &context )
 {
-  mComboBox->setValue( value, context );
+  if ( mComboBox )
+    mComboBox->setValue( value, context );
 }
 
 QVariant QgsProcessingMapLayerWidgetWrapper::widgetValue() const
 {
-  return mComboBox->value();
+  return mComboBox ? mComboBox->value() : QVariant();
 }
 
 QStringList QgsProcessingMapLayerWidgetWrapper::compatibleParameterTypes() const

diff --git a/src/gui/processing/qgsprocessingwidgetwrapperimpl.h b/src/gui/processing/qgsprocessingwidgetwrapperimpl.h
@@ -1671,7 +1671,7 @@ class GUI_EXPORT QgsProcessingMapLayerWidgetWrapper : public QgsAbstractProcessi
 
   private:
 
-    QgsProcessingMapLayerComboBox *mComboBox = nullptr;
+    QPointer< QgsProcessingMapLayerComboBox > mComboBox;
     int mBlockSignals = 0;
 
     friend class TestProcessingGui;