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
dded shell' href='/akspecs/ranger/commit/ranger.py?id=e2393938bf56f2bd6b93ea11e9282cf6d40a2514'>e2393938 ^
06848dc3 ^
e52629c1 ^
f027adc0 ^
9f5eeff7 ^
e52629c1 ^


08f08fb9 ^
d8084b41 ^

b3d031a9 ^

08f08fb9 ^
654af129 ^

d1a1173d ^
d8084b41 ^
cba63cf3 ^
e52629c1 ^
b3d031a9 ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41