Merge pull request #423 from opengisch/QF-1929-fix-fix

Prevent python error popping up because of deleted QgsMapLayer

qfieldsync/gui/layers_config_widget.py

@@ -94,6 +94,10 @@ def __init__(self, project, use_cloud_actions, layer_sources, parent=None):
 
         self.reloadProject()
 
+    def closeEvent(self, event):
+        if Qgis.QGIS_VERSION_INT >= 31900:
+            self.project.dirtySet.disconnect(self._on_dirtyset)
+
     def get_available_actions(self, layer_source):
         if self.use_cloud_actions:
             return layer_source.available_cloud_actions
@@ -248,10 +252,19 @@ def toggleMenu_triggered(self, action):
 
     def _on_dirtyset_wrapper(self):
         def _on_dirtyset():
-            for layer_source in self.layer_sources:
-                layer_source.read_layer()
-
-            self.reloadProject()
+            # the layer might got deleted by the time dirtyset is called
+            try:
+                for layer_source in self.layer_sources:
+                    layer_source.read_layer()
+
+                self.reloadProject()
+            except RuntimeError:
+                # just try to remove the dirtyset connection if possible
+                try:
+                    if Qgis.QGIS_VERSION_INT >= 31900:
+                        self.project.dirtySet.disconnect(self._on_dirtyset)
+                except RuntimeError:
+                    pass
 
         return _on_dirtyset