summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2013-02-16 15:44:18 +0100
committerhut <hut@lavabit.com>2013-02-16 15:44:53 +0100
commit263be09587bd1fe2a6e9e30176983e684e1f69d7 (patch)
tree39c366d4c7f0729524a121fa84939eda9071b40f
parent79ac442b161aee65a670fff3cdbf1075a5b3ece9 (diff)
downloadranger-263be09587bd1fe2a6e9e30176983e684e1f69d7.tar.gz
fsobject.file: preview images even when preview_script is off
-rw-r--r--ranger/fsobject/file.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/ranger/fsobject/file.py b/ranger/fsobject/file.py
index 5831ed3f..9923f559 100644
--- a/ranger/fsobject/file.py
+++ b/ranger/fsobject/file.py
@@ -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
f='#n125'>125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156