From f760326ed26d74a5a3e9f9e115088d857944ac8d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 19 Mar 2019 12:21:22 +0530 Subject: [PATCH] Fix #1820549 [Ampersand is not escaped from strings on right-click menu](https://bugs.launchpad.net/calibre/+bug/1820549) --- src/calibre/gui2/tag_browser/view.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/tag_browser/view.py b/src/calibre/gui2/tag_browser/view.py index e19e7c9f15..29b79dc47e 100644 --- a/src/calibre/gui2/tag_browser/view.py +++ b/src/calibre/gui2/tag_browser/view.py @@ -482,12 +482,13 @@ class TagsView(QTreeView): # {{{ def show_context_menu(self, point): def display_name(tag): + ans = tag.name if tag.category == 'search': n = tag.name if len(n) > 45: n = n[:45] + '...' - return "'" + n + "'" - return tag.name + ans = "'" + n + "'" + return ans.replace('&', '&&') index = self.indexAt(point) self.context_menu = QMenu(self)