From 6fd6a68d9d0e18b68dc4452931eafc2c055affeb Mon Sep 17 00:00:00 2001 From: Megan Conners Date: Sat, 19 Feb 2022 11:41:19 -0500 Subject: [PATCH 1/2] catch AttributeError in plotTreeView double click event --- manuskript/ui/views/plotTreeView.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/manuskript/ui/views/plotTreeView.py b/manuskript/ui/views/plotTreeView.py index 9a592d92..b325dc86 100644 --- a/manuskript/ui/views/plotTreeView.py +++ b/manuskript/ui/views/plotTreeView.py @@ -201,5 +201,8 @@ class plotTreeView(QTreeWidget): def mouseDoubleClickEvent(self, event): item = self.currentItem() # Catching double clicks to forbid collapsing of toplevel items - if item.parent(): - QTreeWidget.mouseDoubleClickEvent(self, event) + try: + if item.parent(): + QTreeWidget.mouseDoubleClickEvent(self, event) + except AttributeError: + pass From b859631a505d19bd73ce1edad0037a9af9128348 Mon Sep 17 00:00:00 2001 From: Tobias Frisch Date: Wed, 30 Mar 2022 22:44:12 +0200 Subject: [PATCH 2/2] Replaced try & catch with early exit on NoneType This should fix the issue without exception handling. --- manuskript/ui/views/plotTreeView.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manuskript/ui/views/plotTreeView.py b/manuskript/ui/views/plotTreeView.py index b325dc86..97c46fc8 100644 --- a/manuskript/ui/views/plotTreeView.py +++ b/manuskript/ui/views/plotTreeView.py @@ -200,9 +200,9 @@ class plotTreeView(QTreeWidget): def mouseDoubleClickEvent(self, event): item = self.currentItem() + if not item: + return + # Catching double clicks to forbid collapsing of toplevel items - try: - if item.parent(): - QTreeWidget.mouseDoubleClickEvent(self, event) - except AttributeError: - pass + if item.parent(): + QTreeWidget.mouseDoubleClickEvent(self, event)