Merge from trunk

This commit is contained in:
Charles Haley 2010-09-13 07:19:45 +01:00
commit e274719992

View File

@ -1056,8 +1056,8 @@ class DeviceBooksModel(BooksModel): # {{{
if hasattr(cdata, 'image_path'): if hasattr(cdata, 'image_path'):
img.load(cdata.image_path) img.load(cdata.image_path)
elif cdata: elif cdata:
if isinstance(cdata, tuple): if isinstance(cdata, (tuple, list)):
img.loadFromData(cdata[2]) img.loadFromData(cdata[-1])
else: else:
img.loadFromData(cdata) img.loadFromData(cdata)
if img.isNull(): if img.isNull():