Merge from trunk

This commit is contained in:
Charles Haley 2010-09-12 21:16:45 +01:00
commit afd1d75e15

View File

@ -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