Merge branch 'master' of https://github.com/cbhaley/calibre

Author: kovidgoyal

src/calibre/gui2/tag_browser/view.py

@@ -704,7 +704,7 @@ def make_icon_name(key, index):
                         self._model.set_value_icon(key, TEMPLATE_ICON_INDICATOR, d.rule[2], False)
                         self.recount()
                     return
-                (icon_file_name, for_children) = extra
+                (icon_file_name, for_children) = extra if extra is not None else (None, None)
                 item_val, desired_file_name = make_icon_name(key, index)
                 if icon_file_name is None:
                     # User wants to specify a specific icon
@@ -1259,7 +1259,7 @@ def get_rule_data(tag, key):
                         return name, icon_name, for_child
 
                     name, icon_name, for_child = get_rule_data(tag, key)
-                    for_name = name or _('this value')
+                    for_name = (name or _('this value')).replace('&', '&&')
                     im = cm.addMenu(_('Manage icon for {}').format(for_name))
                     if name is not None:
                         im.addSection(_('Current value: {}').format(name))