Skip to content

Commit 370b267

Browse files
committed
Fix wrapped c++ object has been deleted error when editing model parameters
Fixes #16858
1 parent ebda2fd commit 370b267

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

python/plugins/processing/modeler/ModelerGraphicItem.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,7 @@ def editElement(self):
195195
if isinstance(self.element, QgsProcessingModelParameter):
196196
dlg = ModelerParameterDefinitionDialog(self.model,
197197
param=self.model.parameterDefinition(self.element.parameterName()))
198-
dlg.exec_()
199-
if dlg.param is not None:
198+
if dlg.exec_() and dlg.param is not None:
200199
self.model.removeModelParameter(self.element.parameterName())
201200
self.element.setParameterName(dlg.param.name())
202201
self.element.setDescription(dlg.param.name())

python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -297,15 +297,15 @@ def setupUi(self):
297297
self.buttonBox.setStandardButtons(QDialogButtonBox.Cancel |
298298
QDialogButtonBox.Ok)
299299
self.buttonBox.setObjectName('buttonBox')
300-
self.buttonBox.accepted.connect(self.okPressed)
301-
self.buttonBox.rejected.connect(self.cancelPressed)
300+
self.buttonBox.accepted.connect(self.accept)
301+
self.buttonBox.rejected.connect(self.reject)
302302

303303
self.verticalLayout.addStretch()
304304
self.verticalLayout.addWidget(self.buttonBox)
305305

306306
self.setLayout(self.verticalLayout)
307307

308-
def okPressed(self):
308+
def accept(self):
309309
description = str(self.nameTextBox.text())
310310
if description.strip() == '':
311311
QMessageBox.warning(self, self.tr('Unable to define parameter'),
@@ -401,8 +401,16 @@ def okPressed(self):
401401
self.param = QgsProcessingParameterCrs(name, description, self.selector.crs().authid())
402402
if not self.requiredCheck.isChecked():
403403
self.param.setFlags(self.param.flags() | QgsProcessingParameterDefinition.FlagOptional)
404-
self.close()
405404

406-
def cancelPressed(self):
405+
settings = QgsSettings()
406+
settings.setValue("/Processing/modelParametersDefinitionDialogGeometry", self.saveGeometry())
407+
408+
QDialog.accept(self)
409+
410+
def reject(self):
407411
self.param = None
408-
self.close()
412+
413+
settings = QgsSettings()
414+
settings.setValue("/Processing/modelParametersDefinitionDialogGeometry", self.saveGeometry())
415+
416+
QDialog.reject(self)

0 commit comments

Comments
 (0)