mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge from trunk
This commit is contained in:
commit
afd1d75e15
@ -1055,8 +1055,8 @@ class DeviceBooksModel(BooksModel): # {{{
|
|||||||
img = QImage()
|
img = QImage()
|
||||||
if hasattr(cdata, 'image_path'):
|
if hasattr(cdata, 'image_path'):
|
||||||
img.load(cdata.image_path)
|
img.load(cdata.image_path)
|
||||||
else:
|
elif cdata:
|
||||||
img.loadFromData(cdata[2])
|
img.loadFromData(cdata)
|
||||||
if img.isNull():
|
if img.isNull():
|
||||||
img = self.default_image
|
img = self.default_image
|
||||||
data['cover'] = img
|
data['cover'] = img
|
||||||
|
Loading…
x
Reference in New Issue
Block a user