Skip to content

Commit 7266410

Browse files
authored
Merge pull request #4533 from boundlessgeo/too_many_dbmanager_errors_fix#15868
[db_manager] catch exception when item has lost reference. for 2.18 regression fixes #15868
2 parents 6c84b6e + b365293 commit 7266410

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

python/plugins/db_manager/db_tree.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def addLayer(self):
164164
layers = QgsMapLayerRegistry.instance().addMapLayers([layer])
165165
if len(layers) != 1:
166166
QgsMessageLog.logMessage(
167-
self.tr("%1 is an invalid layer - not loaded").replace("%1", layer.publicSource()))
167+
self.tr("%1 is an invalid layer - not loaded").replace("%1", layer.publicSource()), "DBManagerPlugin")
168168
msgLabel = QLabel(self.tr(
169169
"%1 is an invalid layer and cannot be loaded. Please check the <a href=\"#messageLog\">message log</a> for further info.").replace(
170170
"%1", layer.publicSource()), self.mainWindow.infoBar)

python/plugins/db_manager/layer_preview.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from qgis.PyQt.QtWidgets import QApplication
2626

2727
from qgis.gui import QgsMapCanvas, QgsMapCanvasLayer, QgsMessageBar
28-
from qgis.core import QgsVectorLayer, QgsMapLayerRegistry, QgsProject
28+
from qgis.core import QgsVectorLayer, QgsMapLayerRegistry, QgsProject, QgsMessageLog
2929

3030
from .db_plugins.plugin import Table
3131

@@ -78,11 +78,13 @@ def setDirty(self, val=True):
7878
def _clear(self):
7979
""" remove any layers from preview canvas """
8080
if self.item is not None:
81-
## skip exception on RuntimeError fixes #6892
8281
try:
8382
self.item.aboutToChange.disconnect(self.setDirty)
84-
except RuntimeError:
85-
pass
83+
## skip exception on RuntimeError fixes #6892
84+
## skip TypeError and generic Exceptions fixes #15868
85+
## generally due the remove of self.item object or C++ referenced object
86+
except Exception as ex:
87+
QgsMessageLog.logMessage(unicode(ex), "DBManagerPlugin")
8688

8789
self.item = None
8890
self.dirty = False

0 commit comments

Comments
 (0)