Qt4 - Save Extended panel size/pos in the good way. Ref #1374.

diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index 8efe9ce752358ca3fd488d305755ed87ca736cac..af9c7ed81f999211ef92d1dd31c59f34b8738488 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.cpp
+++ b/modules/gui/qt4/dialogs/extended.cpp
@@ -85,11 +85,8 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
     readSettings( "EPanel", QSize( 400, 280 ), QPoint( 450, 0 ) );
 }
 
-void ExtendedDialog::savingSettings()
+ExtendedDialog::~ExtendedDialog()
 {
     writeSettings( "EPanel" );
 }
 
-ExtendedDialog::~ExtendedDialog()
-{}
-

diff --git a/modules/gui/qt4/dialogs/extended.hpp b/modules/gui/qt4/dialogs/extended.hpp
index b4f8a2f64f10eb0f97c9c620f0f8280942202cd0..001ef887421713504dd5e4ccecff527031e92453 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.hpp
+++ b/modules/gui/qt4/dialogs/extended.hpp
@@ -36,9 +36,12 @@ public:
             instance = new ExtendedDialog( p_intf );
         return instance;
     }
+    static void killInstance()
+    {
+        if( instance ) delete instance;
+        instance = NULL;
+    }
     virtual ~ExtendedDialog();
-    static bool exists(){ return ( instance != NULL ) ; }
-    void savingSettings();
 private:
     ExtendedDialog( intf_thread_t * );
     static ExtendedDialog *instance;

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

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index fc8756d7d693496e5b7ca09ccf644115588c50c7..25513b1516eb5ed9deb47b4667b9e820d4b6bc0d 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -273,8 +273,6 @@ MainInterface::~MainInterface()
     msg_Dbg( p_intf, "Destroying the main interface" );
 
     if( playlistWidget ) playlistWidget->savingSettings( settings );
-    if( ExtendedDialog::exists() )
-        ExtendedDialog::getInstance( p_intf )->savingSettings();
 
     settings->beginGroup( "MainWindow" );
 //    settings->setValue( "playlist-floats", (int)(dockPL->isFloating()) );