mirror of
git://github.com/kovidgoyal/calibre.git
synced 2026-05-01 17:33:11 +02:00
Merge from trunk
This commit is contained in:
commit
e274719992
1 changed files with 2 additions and 2 deletions
|
|
@ -1056,8 +1056,8 @@ def current_changed(self, current, previous):
|
|||
if hasattr(cdata, 'image_path'):
|
||||
img.load(cdata.image_path)
|
||||
elif cdata:
|
||||
if isinstance(cdata, tuple):
|
||||
img.loadFromData(cdata[2])
|
||||
if isinstance(cdata, (tuple, list)):
|
||||
img.loadFromData(cdata[-1])
|
||||
else:
|
||||
img.loadFromData(cdata)
|
||||
if img.isNull():
|
||||
|
|
|
|||
Loading…
Reference in a new issue