diff options
author | hut <hut@lavabit.com> | 2010-04-12 10:38:27 +0200 |
---|---|---|
committer | hut <hut@lavabit.com> | 2010-04-12 11:27:52 +0200 |
commit | 444f836128a96ec877d1a4a7412be5d185cc6464 (patch) | |
tree | 128c4e1085cd3dcb1dfcb5b71e4e0553811f545f /ranger/fsobject/directory.py | |
parent | 44a28601f4e1ab857e75ee4a48f45464f2ff3eff (diff) | |
download | ranger-444f836128a96ec877d1a4a7412be5d185cc6464.tar.gz |
Fixed handling of directories with GC'd subdirs
Diffstat (limited to 'ranger/fsobject/directory.py')
-rw-r--r-- | ranger/fsobject/directory.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ranger/fsobject/directory.py b/ranger/fsobject/directory.py index 79e32bff..29f0042c 100644 --- a/ranger/fsobject/directory.py +++ b/ranger/fsobject/directory.py @@ -237,6 +237,7 @@ class Directory(FileSystemObject, Accumulator, SettingsAware): Loads the contents of the directory. Use this sparingly since it takes rather long. """ + self.content_outdated = False if not self.loading: self.load_once() @@ -370,8 +371,7 @@ class Directory(FileSystemObject, Accumulator, SettingsAware): if self.load_content_once(*a, **k): return True - if self.content_outdated: - self.content_outdated = False + if self.files is None or self.content_outdated: self.load_content(*a, **k) return True @@ -403,6 +403,7 @@ class Directory(FileSystemObject, Accumulator, SettingsAware): """The number of containing files""" if not self.accessible or not self.content_loaded: raise ranger.fsobject.NotLoadedYet() + assert self.files is not None return len(self.files) def __eq__(self, other): |