Fix #1694757: calibre fails to start if the tweak tag_browser_category_order is malformed.

This commit is contained in:
Charles Haley 2017-06-01 08:18:39 +02:00
parent a91df2f4a0
commit 4634fb3dab

View File

@ -994,7 +994,13 @@ class TagsModel(QAbstractItemModel): # {{{
self.categories[category] = tb_categories[category]['name']
# Now build the list of fields in display order
order = tweaks['tag_browser_category_order']
try:
order = tweaks['tag_browser_category_order']
if not isinstance(order, dict):
raise TypeError()
except:
print ('Tweak tag_browser_category_order is not valid. Ignored')
order = {'*': 100}
defvalue = order.get('*', 100)
self.row_map = sorted(self.categories, key=lambda x: order.get(x, defvalue))
return data