Skip to content

Commit

Permalink
Merge pull request #6924 from m-kuhn/avoid_unnecessary_confirmation_d…
Browse files Browse the repository at this point in the history
…ialogs

Avoid unnecessary confirmation dialogs
  • Loading branch information
m-kuhn authored May 7, 2018
2 parents ba9f27e + ac508d4 commit 9e5cfb0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions python/plugins/processing/algs/qgis/ui/FieldsMappingPanel.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,8 @@ def setDelegate(self, column_name, delegate):
delegate)

def setLayer(self, layer):
if self.model.layer() == layer:
return
self.model.setLayer(layer)
if layer is None:
return
Expand Down
2 changes: 2 additions & 0 deletions python/plugins/processing/tools/general.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,6 @@ def execAlgorithmDialog(algOrName, parameters={}):
canvas.setMapTool(prevMapTool)

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

0 comments on commit 9e5cfb0

Please sign in to comment.