From 36a8688271953fdfffb5bd0bae967cde0b675b05 Mon Sep 17 00:00:00 2001 From: hut Date: Sun, 24 Mar 2013 14:56:00 +0100 Subject: container.directory: fix pointer in refilter, not in sort --- ranger/container/directory.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ranger/container/directory.py b/ranger/container/directory.py index 4b3267c6..21234186 100644 --- a/ranger/container/directory.py +++ b/ranger/container/directory.py @@ -174,8 +174,10 @@ class Directory(FileSystemObject, Accumulator, Loadable): hidden_filter = re.compile(self.settings.hidden_filter) else: hidden_filter = None + self.files = [f for f in self.files_all if accept_file( f.basename, self, hidden_filter, self.filter)] + self.move_to_obj(self.pointed_obj) # XXX: Check for possible race conditions def load_bit_by_bit(self): @@ -343,7 +345,6 @@ class Directory(FileSystemObject, Accumulator, Loadable): if self.files_all is None: return - old_pointed_obj = self.pointed_obj try: sort_func = self.sort_dict[self.settings.sort] except: @@ -367,11 +368,6 @@ class Directory(FileSystemObject, Accumulator, Loadable): self.refilter() - if self.pointer is not None: - self.move_to_obj(old_pointed_obj) - else: - self.correct_pointer() - def _get_cumulative_size(self): if self.size == 0: return 0 -- cgit 1.4.1-2-gfad0