Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

E-book viewer: Fix regression that broke import/export of bookmarks

Browse Source 
Fixes #1231980 [Calibre ePub Viewer: Importing bookmarks does not work](https://bugs.launchpad.net/calibre/+bug/1231980)
This commit is contained in:
Kovid Goyal 2013-10-05 12:50:34 +05:30
parent 7e84ed6ed5
commit d1fb70cf32
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/viewer/bookmarkmanager.py
View File

@ -100,7 +100,7 @@ class BookmarkManager(QDialog, Ui_BookmarkManager):
bad = False bad = False
try: try:
for bm in imported: for bm in imported:
if len(bm) != 2: if 'title' not in bm:
bad = True bad = True
break break
except: except:
@ -109,9 +109,9 @@ class BookmarkManager(QDialog, Ui_BookmarkManager):
if not bad: if not bad:
bookmarks = self.get_bookmarks() bookmarks = self.get_bookmarks()
for bm in imported: for bm in imported:
if bm not in bookmarks and bm['title'] != 'calibre_current_page_bookmark': if bm not in bookmarks:
bookmarks.append(bm) bookmarks.append(bm)
self.set_bookmarks(bookmarks) self.set_bookmarks([bm for bm in bookmarks if bm['title'] != 'calibre_current_page_bookmark'])
if __name__ == '__main__': if __name__ == '__main__':
from PyQt4.Qt import QApplication from PyQt4.Qt import QApplication