Update bookmark list before showing dialog.

Fixes #2100.

Override toggleVisible of BookmarkDialog to call update before using toggleVisible of QVLCFrame

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/modules/gui/qt4/dialogs/bookmarks.cpp b/modules/gui/qt4/dialogs/bookmarks.cpp
index 18558db272f2322ea0fff42d34686dff5b137cb3..bfea0eb061f31f99d21958ddfe8a0e0470f70cae 100644 (file)
--- a/modules/gui/qt4/dialogs/bookmarks.cpp
+++ b/modules/gui/qt4/dialogs/bookmarks.cpp
@@ -278,3 +278,14 @@ void BookmarksDialog::activateItem( QModelIndex index )
 
     input_Control( p_input, INPUT_SET_BOOKMARK, index.row() );
 }
+
+void BookmarksDialog::toggleVisible()
+{
+    /* Update, to show existing bookmarks in case a new playlist
+       was opened */
+    if( !isVisible() )
+    {
+        update();
+    }
+    QVLCFrame::toggleVisible();
+}

diff --git a/modules/gui/qt4/dialogs/bookmarks.hpp b/modules/gui/qt4/dialogs/bookmarks.hpp
index ad81bc2c7009a09adf0f0f985cbabc99e5c0f05a..17c7bdee98df204b998517f011ae89b91bf56348 100644 (file)
--- a/modules/gui/qt4/dialogs/bookmarks.hpp
+++ b/modules/gui/qt4/dialogs/bookmarks.hpp
@@ -35,6 +35,8 @@ class QPushButton;
 class BookmarksDialog : public QVLCFrame, public Singleton<BookmarksDialog>
 {
     Q_OBJECT
+public:
+    void toggleVisible();
 private:
     BookmarksDialog( intf_thread_t * );
     virtual ~BookmarksDialog();