summaryrefslogtreecommitdiffstats
path: root/ranger/fsobject/file.py
diff options
context:
space:
mode:
Diffstat (limited to 'ranger/fsobject/file.py')
-rw-r--r--ranger/fsobject/file.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/ranger/fsobject/file.py b/ranger/fsobject/file.py
index 5831ed3f..16b71945 100644
--- a/ranger/fsobject/file.py
+++ b/ranger/fsobject/file.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011 Roman Zimbelmann <romanz@lavabit.com>
+# Copyright (C) 2009-2013 Roman Zimbelmann <hut@lavabit.com>
# This software is distributed under the terms of the GNU GPL version 3.
import re
@@ -71,7 +71,9 @@ class File(FileSystemObject):
if self.fm.settings.preview_script and \
self.fm.settings.use_preview_script:
return True
- if self.image or self.container:
+ if self.image and self.fm.settings.preview_images:
+ return True
+ if self.container:
return False
if PREVIEW_WHITELIST.search(self.basename):
return True