fix some ui thread errors

[fanfix.git] / src / be / nikiroo / fanfix / reader / ui / GuiReaderFrame.java

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
index e2ead3988a477bac15128d2cd18b095517e638f4..df8707c72331e5eeefb8f53012c8be4ea97a683d 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
@@ -109,7 +109,7 @@ class GuiReaderFrame extends JFrame implements FrameHelper {
        }
 
        @Override
-       public JPopupMenu createSourcePopup() {
+       public JPopupMenu createSourceAuthorPopup() {
                JPopupMenu popup = new JPopupMenu();
                popup.add(createMenuItemOpenBook());
                return popup;
@@ -117,6 +117,8 @@ class GuiReaderFrame extends JFrame implements FrameHelper {
 
        @Override
        public void createMenu(boolean libOk) {
+               invalidate();
+
                JMenuBar bar = new JMenuBar();
 
                JMenu file = new JMenu("File");
@@ -748,7 +750,7 @@ class GuiReaderFrame extends JFrame implements FrameHelper {
        }
 
        /**
-        * Create the open menu item for a book or a source/type (no LUID).
+        * Create the open menu item for a book, a source/type or an author.
         * 
         * @return the item
         */
@@ -759,10 +761,10 @@ class GuiReaderFrame extends JFrame implements FrameHelper {
                        public void actionPerformed(ActionEvent e) {
                                final GuiReaderBook selectedBook = mainPanel.getSelectedBook();
                                if (selectedBook != null) {
-                                       if (selectedBook.getInfo().getMeta().getLuid() == null) {
+                                       if (selectedBook.getInfo().getMeta() == null) {
                                                mainPanel.removeBookPanes();
-                                               mainPanel.addBookPane(selectedBook.getInfo().getMeta()
-                                                               .getSource(), true);
+                                               mainPanel.addBookPane(selectedBook.getInfo().getMainInfo(),
+                                                               mainPanel.getCurrentType());
                                                mainPanel.refreshBooks();
                                        } else {
                                                mainPanel.openBook(selectedBook);