From 2b5bf23bbd15df62b40955e2e6fe71903bf533da Mon Sep 17 00:00:00 2001 From: RumovZ Date: Sat, 25 Sep 2021 15:21:06 +0200 Subject: [PATCH] Check 'index.isValid()' in 'table.model' --- qt/aqt/browser/table/model.py | 4 ++++ qt/aqt/browser/table/table.py | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt/aqt/browser/table/model.py b/qt/aqt/browser/table/model.py index f04e2d63e..1d4cae4ac 100644 --- a/qt/aqt/browser/table/model.py +++ b/qt/aqt/browser/table/model.py @@ -175,6 +175,8 @@ class DataModel(QAbstractTableModel): def get_card(self, index: QModelIndex) -> Optional[Card]: """Try to return the indicated, possibly deleted card.""" + if not index.isValid(): + return None try: return self._state.get_card(self.get_item(index)) except NotFoundError: @@ -182,6 +184,8 @@ class DataModel(QAbstractTableModel): def get_note(self, index: QModelIndex) -> Optional[Note]: """Try to return the indicated, possibly deleted note.""" + if not index.isValid(): + return None try: return self._state.get_note(self.get_item(index)) except NotFoundError: diff --git a/qt/aqt/browser/table/table.py b/qt/aqt/browser/table/table.py index 3f555fc25..2ea67e0c8 100644 --- a/qt/aqt/browser/table/table.py +++ b/qt/aqt/browser/table/table.py @@ -78,13 +78,9 @@ class Table: # Get objects def get_current_card(self) -> Optional[Card]: - if not self.has_current(): - return None return self._model.get_card(self._current()) def get_current_note(self) -> Optional[Note]: - if not self.has_current(): - return None return self._model.get_note(self._current()) def get_single_selected_card(self) -> Optional[Card]: