Merge pull request #6924 from m-kuhn/avoid_unnecessary_confirmation_d…

…ialogs Avoid unnecessary confirmation dialogs
qgis · May 7, 2018 · 9e5cfb0 · 9e5cfb0
2 parents ba9f27e + ac508d4
commit 9e5cfb0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/python/plugins/processing/algs/qgis/ui/FieldsMappingPanel.py b/python/plugins/processing/algs/qgis/ui/FieldsMappingPanel.py
@@ -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

diff --git a/python/plugins/processing/tools/general.py b/python/plugins/processing/tools/general.py
@@ -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