Skip to content

Commit 9e5cfb0

Browse files
authored
Merge pull request #6924 from m-kuhn/avoid_unnecessary_confirmation_dialogs
Avoid unnecessary confirmation dialogs
2 parents ba9f27e + ac508d4 commit 9e5cfb0

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

python/plugins/processing/algs/qgis/ui/FieldsMappingPanel.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,8 @@ def setDelegate(self, column_name, delegate):
318318
delegate)
319319

320320
def setLayer(self, layer):
321+
if self.model.layer() == layer:
322+
return
321323
self.model.setLayer(layer)
322324
if layer is None:
323325
return

python/plugins/processing/tools/general.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,6 @@ def execAlgorithmDialog(algOrName, parameters={}):
154154
canvas.setMapTool(prevMapTool)
155155

156156
results = dlg.results()
157+
# make sure the dialog is destroyed and not only hidden on pressing Esc
158+
dlg.close()
157159
return results

0 commit comments

Comments
 (0)