do not raise error in processing algoirthm if map tool previously used

by the canvas was destroyed (fix #53294)
qgis · Jun 26, 2023 · 71a3fe8 · 71a3fe8
1 parent 710bbdd
commit 71a3fe8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/python/plugins/processing/ProcessingPlugin.py b/python/plugins/processing/ProcessingPlugin.py
@@ -397,7 +397,10 @@ def executeAlgorithm(self, alg_id, parent, in_place=False, as_batch=False):
                             canvas.mapTool().reset()
                         except Exception:
                             pass
-                        canvas.setMapTool(prevMapTool)
+                        try:
+                            canvas.setMapTool(prevMapTool)
+                        except RuntimeError:
+                            pass
                 else:
                     feedback = MessageBarProgress(algname=alg.displayName())
                     context = dataobjects.createContext(feedback)

diff --git a/python/plugins/processing/gui/AlgorithmLocatorFilter.py b/python/plugins/processing/gui/AlgorithmLocatorFilter.py
@@ -127,7 +127,10 @@ def triggerResult(self, result):
                     canvas.mapTool().reset()
                 except:
                     pass
-                canvas.setMapTool(prevMapTool)
+                try:
+                    canvas.setMapTool(prevMapTool)
+                except RuntimeError:
+                    pass
 
 
 class InPlaceAlgorithmLocatorFilter(QgsLocatorFilter):