From 20b2b0d5d45b27b904d97ba7425e41040ede610f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 22 Feb 2020 08:53:54 +0530 Subject: [PATCH] Edit book: Fix right click to edit images in the preview panel not working in books with html files and images in separate top level folders --- src/calibre/gui2/tweak_book/preview.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/calibre/gui2/tweak_book/preview.py b/src/calibre/gui2/tweak_book/preview.py index cce1b07951..4f13b71e8c 100644 --- a/src/calibre/gui2/tweak_book/preview.py +++ b/src/calibre/gui2/tweak_book/preview.py @@ -400,15 +400,13 @@ class WebView(RestartingWebEngineView, OpenWithHandler): if url.scheme() == FAKE_PROTOCOL: href = url.path().lstrip('/') c = current_container() - current_name = self.parent().current_name - if current_name: - resource_name = c.href_to_name(href, current_name) - if resource_name and c.exists(resource_name) and resource_name not in c.names_that_must_not_be_changed: - self.add_open_with_actions(menu, resource_name) - if data.mediaType() == data.MediaTypeImage: - mime = c.mime_map[resource_name] - if mime.startswith('image/'): - menu.addAction(_('Edit %s') % resource_name, partial(self.edit_image, resource_name)) + resource_name = c.href_to_name(href) + if resource_name and c.exists(resource_name) and resource_name not in c.names_that_must_not_be_changed: + self.add_open_with_actions(menu, resource_name) + if data.mediaType() == data.MediaTypeImage: + mime = c.mime_map[resource_name] + if mime.startswith('image/'): + menu.addAction(_('Edit %s') % resource_name, partial(self.edit_image, resource_name)) menu.exec_(ev.globalPos()) def open_with(self, file_name, fmt, entry):