DBManager: trap RuntimeError when disconnecting signals from a delete…

…d object
qgis · Sep 29, 2015 · ece1169 · ece1169
1 parent fea4ed9
commit ece1169
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/python/plugins/db_manager/info_viewer.py b/python/plugins/db_manager/info_viewer.py
@@ -84,7 +84,11 @@ def setDirty(self, val=True):
 
     def _clear(self):
         if self.item is not None:
-            self.disconnect(self.item, SIGNAL('aboutToChange'), self.setDirty)
+            ## skip exception on RuntimeError fixes #6892
+            try:
+                self.disconnect(self.item, SIGNAL('aboutToChange'), self.setDirty)
+            except RuntimeError:
+                pass
         self.item = None
         self.dirty = False
 

diff --git a/python/plugins/db_manager/layer_preview.py b/python/plugins/db_manager/layer_preview.py
@@ -51,7 +51,7 @@ def refresh(self):
         self.setDirty(True)
         self.loadPreview(self.item)
 
-    def loadPreview(self, item, force=False):
+    def loadPreview(self, item):
         if item == self.item and not self.dirty:
             return
         self._clear()