summary refs log tree commit diff stats
path: root/ranger
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-10-11 07:28:10 +0200
committerhut <hut@lavabit.com>2010-10-11 07:28:10 +0200
commit6ab2c84a6b3b8d015f9e808f6fbba5846677e9f7 (patch)
tree1b8f4c02227185af1aa9370841e11dc05fe29bcd /ranger
parente3ad1e7ecdedcd3f8badec20b243ab2079262e98 (diff)
downloadranger-6ab2c84a6b3b8d015f9e808f6fbba5846677e9f7.tar.gz
fsobject.file: fix preview_files option
Diffstat (limited to 'ranger')
-rw-r--r--ranger/fsobject/file.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ranger/fsobject/file.py b/ranger/fsobject/file.py
index 4de77d80..5fd90b96 100644
--- a/ranger/fsobject/file.py
+++ b/ranger/fsobject/file.py
@@ -77,14 +77,14 @@ class File(FileSystemObject):
 		return False
 
 	def has_preview(self):
-		if self.fm.settings.preview_script:
-			return True
 		if not self.fm.settings.preview_files:
 			return False
 		if self.is_socket or self.is_fifo or self.is_device:
 			return False
 		if not self.accessible:
 			return False
+		if self.fm.settings.preview_script:
+			return True
 		if self.image or self.container:
 			return False
 		if PREVIEW_WHITELIST.search(self.basename):
span class='oid'>94c5d83e ^
582f3519 ^
e06e12ef ^
3a1e1f28 ^
f473be92 ^
3a1e1f28 ^

2c5ea01d ^
5fca2a0b ^
b0a216f5 ^
2c5ea01d ^
b0a216f5 ^



3a1e1f28 ^
b0a216f5 ^
e7758eba ^
b0a216f5 ^

ececd03e ^














2c5ea01d ^
582f3519 ^
b06433bc ^
a65a2695 ^

582f3519 ^
94c5d83e ^
dee6cfa6 ^
e9e4b4ff ^
b0a216f5 ^
76612b05 ^
ececd03e ^
b0a216f5 ^
e9e4b4ff ^





612b8b8b ^
e9e4b4ff ^
52403c53 ^
ad51cca4 ^
08e43b29 ^


ad51cca4 ^






b3d031a9 ^
c5f776ed ^
b3d031a9 ^

bc2c5619 ^
c5f776ed ^

b3d031a9 ^

c5f776ed ^

c216901a ^
9d82571b ^

5fca2a0b ^
9cf43c17 ^
5fca2a0b ^
c5f776ed ^

a052151f ^
c5f776ed ^

f2c8a7ff ^




185c022e ^
5fca2a0b ^
c7720fff ^


a6836d5d ^

c7720fff ^
8d21b83c ^


e9e4b4ff ^
ececd03e ^
e9e4b4ff ^
0c2c782d ^
636d9393 ^
b0a216f5 ^
c6afc196 ^

c0d63e78 ^


ececd03e ^
f2c8a7ff ^

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
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140