From bcb501b6de0c4b8023cd66cd83b694418927e344 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 25 May 2022 08:35:31 +0530 Subject: [PATCH] E-book viewer: Fix incorrect sorting of highlights from the first internal file of a book. Fixes #1972069 [Annotations Sometimes List Out Of Order](https://bugs.launchpad.net/calibre/+bug/1972069) --- src/calibre/gui2/viewer/highlights.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/viewer/highlights.py b/src/calibre/gui2/viewer/highlights.py index c52049b272..dc23261c97 100644 --- a/src/calibre/gui2/viewer/highlights.py +++ b/src/calibre/gui2/viewer/highlights.py @@ -277,7 +277,8 @@ class Highlights(QTreeWidget): def cfi_key(h): cfi = h.get('start_cfi') - return (h.get('spine_index') or defval[0], cfi_sort_key(cfi)) if cfi else defval + si = h.get('spine_index') + return (defval[0] if si is None else si, cfi_sort_key(cfi)) if cfi else defval return sorted(highlights, key=cfi_key)