diff options
| -rw-r--r-- | ranger/core/tab.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/ranger/core/tab.py b/ranger/core/tab.py index b61a77cc..3a0fb943 100644 --- a/ranger/core/tab.py +++ b/ranger/core/tab.py @@ -57,23 +57,21 @@ class Tab(FileManagerAware, SettingsAware): # pylint: disable=too-many-instance thisfile = property(_get_thisfile, _set_thisfile) def _get_pointer(self): - if ( - self.thisdir is not None - and self.thisdir.files[self._pointer] != self._pointed_obj - ): - try: - self._pointer = self.thisdir.files.index(self._pointed_obj) - except ValueError: - self._pointed_obj = self.thisdir.files[self._pointer] + try: + if self.thisdir.files[self._pointer] != self._pointed_obj: + try: + self._pointer = self.thisdir.files.index(self._pointed_obj) + except ValueError: + self._set_pointer(self._pointer) + except (TypeError, IndexError): + pass return self._pointer def _set_pointer(self, value): self._pointer = value try: self._pointed_obj = self.thisdir.files[self._pointer] - except TypeError: - pass - except IndexError: + except (TypeError, IndexError): pass pointer = property(_get_pointer, _set_pointer) |