summary refs log tree commit diff stats
path: root/ranger
diff options
context:
space:
mode:
authorhut <hut@lepus.uberspace.de>2014-04-11 15:59:07 +0200
committerhut <hut@lepus.uberspace.de>2014-04-11 15:59:07 +0200
commitf57bb6033f146894db542c727c4910cafd25f3f2 (patch)
treeae54cfbc1d2149ae70328cc309cf0df4367a3d3d /ranger
parent64e92ada2321ffe4149a4f3f2492a1e34a959881 (diff)
parenteb26387a52b8fbfc93d37ec18952e0837cbf9caf (diff)
downloadranger-f57bb6033f146894db542c727c4910cafd25f3f2.tar.gz
Merge remote-tracking branch 'taylorchu/master'
Diffstat (limited to 'ranger')
-rw-r--r--ranger/container/file.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/ranger/container/file.py b/ranger/container/file.py
index b1245647..ab677125 100644
--- a/ranger/container/file.py
+++ b/ranger/container/file.py
@@ -92,4 +92,7 @@ class File(FileSystemObject):
         return self.fm.get_preview(self, width, height)
 
     def is_image_preview(self):
-        return 'imagepreview' in self.fm.previews[self.realpath]
+        try:
+            return self.fm.previews[self.realpath]['imagepreview']
+        except KeyError:
+            return False
ter James Booth <boothj5@gmail.com> 2014-08-24 20:57:39 +0100 Added license exemption for OpenSSL to source headers' href='/danisanti/profani-tty/commit/src/main.c?id=f9737251a68da0a815dffd8d10a575cfea8539c3'>f9737251 ^
a7d89e0e ^
17488ca3 ^
9b177a9e ^
17488ca3 ^
9b55f2de ^
a4cadf78 ^
7c908780 ^
9b177a9e ^
0fbaa6f5 ^
6b852a2f ^
fc5bfb7d ^
ca1dcdda ^







17b4e45c ^



9b55f2de ^
a4cadf78 ^

581f58e4 ^
7c908780 ^
a2726b6a ^




7c908780 ^
279737ba ^
a2726b6a ^
6bad38c2 ^
f2159559 ^
5e99a791 ^






e0dfe483 ^

a2726b6a ^
7c908780 ^
034a9858 ^
b8207207 ^
75cfe388 ^
46e938b6 ^
4f19ea26 ^
7c908780 ^

6bad38c2 ^
a2726b6a ^

72d96a92 ^
7c908780 ^

7c908780 ^

c9ed5834 ^
98bc1abb ^
72d96a92 ^
7c908780 ^
72d96a92 ^
453fcae2 ^

7c908780 ^
9b177a9e ^


6b852a2f ^
9b177a9e ^
6b852a2f ^

9b177a9e ^
6b852a2f ^

13088e0a ^

8c08e64f ^
14c8f53f ^
7c908780 ^


0115d71e ^


651d5aaa ^
2b88e2f1 ^
2b88e2f1 ^
e434b1bb ^
651d5aaa ^




9b177a9e ^
a2726b6a ^
ca1dcdda ^
0115d71e ^



9b177a9e ^
a2726b6a ^
ca1dcdda ^
2490c3ed ^



249701fe ^





9b177a9e ^
bd928f0f ^




9b177a9e ^
a2726b6a ^
17b4e45c ^

2783c84a ^



697db019 ^
791b13cb ^
1e60d17d ^
791b13cb ^
1e60d17d ^

7c908780 ^
72d96a92 ^

b8207207 ^

d18ec23d ^

c9fcd018 ^



4f19ea26 ^
5d9c7ffd ^


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
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190