Qt4 - Same for Bookmark Dialog Ref. #1374

diff --git a/modules/gui/qt4/dialogs/bookmarks.cpp b/modules/gui/qt4/dialogs/bookmarks.cpp
index 4aed4d4f34ea711e593b4bf1363db00fc8d45500..343a1cdefdec6382f7992381f3fc73a04b1914f7 100644 (file)
--- a/modules/gui/qt4/dialogs/bookmarks.cpp
+++ b/modules/gui/qt4/dialogs/bookmarks.cpp
@@ -77,10 +77,12 @@ BookmarksDialog::BookmarksDialog( intf_thread_t *_p_intf ):QVLCFrame( _p_intf )
     BUTTONACT( clearButton, clear() );
     BUTTONACT( extractButton, extract() );
 
+    readSettings( "Bookmarks" );
 }
 
 BookmarksDialog::~BookmarksDialog()
 {
+    writeSettings( "Bookmarks" );
 }
 
 void BookmarksDialog::update()

diff --git a/modules/gui/qt4/dialogs/bookmarks.hpp b/modules/gui/qt4/dialogs/bookmarks.hpp
index e8a168a3d7d082aacccfda0cf98a00cf5d3bd669..f78ef6d65670ea32b0c15423045dcc2d18e5d5fb 100644 (file)
--- a/modules/gui/qt4/dialogs/bookmarks.hpp
+++ b/modules/gui/qt4/dialogs/bookmarks.hpp
@@ -40,8 +40,12 @@ public:
             instance = new BookmarksDialog( p_intf );
         return instance;
     }
+    static void killInstance()
+    {
+        if( instance ) delete instance;
+        instance = NULL;
+    }
     virtual ~BookmarksDialog();
-    static bool exists() { return ( instance != NULL ) ; }
 private:
     BookmarksDialog( intf_thread_t * );
     static BookmarksDialog *instance;

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index f31d5de941cc81fe3afee167b5a312aa8eada75c..4c4a70ea2d9c270968aab4fa6e68c8348218a64c 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -77,6 +77,7 @@ DialogsProvider::~DialogsProvider()
     MediaInfoDialog::killInstance();
     MessagesDialog::killInstance();
     ExtendedDialog::killInstance();
+    BookmarksDialog::killInstance();
     fixed_timer->stop();
 }