Fix some playlist start showing/non-showing bug.

Still errors present, but too latE.

diff --git a/modules/gui/qt4/components/playlist/playlist.cpp b/modules/gui/qt4/components/playlist/playlist.cpp
index 2ae4a44a2787b3a0bb320e13ef36791fa503295c..7168d36d3645b85234c8b1c1d5c23401c50e1026 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist.cpp
+++ b/modules/gui/qt4/components/playlist/playlist.cpp
@@ -156,3 +156,15 @@ void PlaylistWidget::dragEnterEvent(QDragEnterEvent *event)
     event->acceptProposedAction();
 }
 
+void PlaylistWidget::closeEvent( QCloseEvent *event )
+{
+    if( THEDP->isDying() )
+    {
+        close();
+    }
+    else
+    {
+        if( p_intf->p_sys->p_mi )
+            p_intf->p_sys->p_mi->togglePlaylist();
+    }
+}

diff --git a/modules/gui/qt4/components/playlist/playlist.hpp b/modules/gui/qt4/components/playlist/playlist.hpp
index 5945176f149a41ae05946dfd2431ae6fdff961cc..701b913298f680d8803ea52c138c4da77a7b9d22 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist.hpp
+++ b/modules/gui/qt4/components/playlist/playlist.hpp
@@ -56,8 +56,9 @@ private:
     QWidget *parent;
 protected:
     intf_thread_t *p_intf;
-    void dropEvent( QDropEvent *);
-    void dragEnterEvent( QDragEnterEvent * );
+    virtual void dropEvent( QDropEvent *);
+    virtual void dragEnterEvent( QDragEnterEvent * );
+    virtual void closeEvent( QCloseEvent * );
 
 private slots:
     void setArt( QString );

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index cf4207e0bf6294b5a81401d57cfe40d191c802b3..fe37d853450fa09f649564e7cf70051d9ee2b03f 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -57,6 +57,7 @@ DialogsProvider* DialogsProvider::instance = NULL;
 DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) :
                                   QObject( NULL ), p_intf( _p_intf )
 {
+    b_isDying = false;
     fixed_timer = new QTimer( this );
     fixed_timer->start( 150 /* milliseconds */ );
 
@@ -92,6 +93,7 @@ DialogsProvider::~DialogsProvider()
 
 void DialogsProvider::quit()
 {
+    b_isDying = true;
     vlc_object_kill( p_intf->p_libvlc );
     QApplication::closeAllWindows();
     QApplication::quit();

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index d86e24eea48819e3ac4be98472d468cc680d0e67..d69e9f5f07c137865b85c06dc441b11bbb189fa9 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -116,6 +116,7 @@ public:
                                 EXT_FILTER_VIDEO | EXT_FILTER_AUDIO |
                                 EXT_FILTER_PLAYLIST,
                                 QString path = QString() );
+    bool isDying() { return b_isDying; }
 protected:
     QSignalMapper *menusMapper;
     QSignalMapper *menusUpdateMapper;
@@ -127,6 +128,7 @@ private:
     intf_thread_t *p_intf;
     static DialogsProvider *instance;
     void addFromSimple( bool, bool );
+    bool b_isDying;
 
 public slots:
     void doInteraction( intf_dialog_args_t * );

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 7a5b1966b4d1aa95b4d48d2ae4ff2f18f69ed047..84a18832389f033c7f880080dd22051294b079d4 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -218,10 +218,12 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
     QVLCTools::restoreWidgetPosition( settings, this, QSize(380, 60) );
 
 
-    /* Playlist */
-    if( settings->value( "playlist-visible", 0 ).toInt() ) togglePlaylist();
+    bool b_visible = settings->value( "playlist-visible", 0 ).toInt();
     settings->endGroup();
 
+    /* Playlist */
+    if( b_visible ) togglePlaylist();
+
     /* Final sizing and showing */
     setMinimumWidth( __MAX( controls->sizeHint().width(),
                             menuBar()->sizeHint().width() ) );
@@ -740,8 +742,10 @@ void MainInterface::togglePlaylist()
     {
         playlistWidget = new PlaylistWidget( p_intf, this );
 
-        i_pl_dock = (pl_dock_e)getSettings()
-                         ->value( "pl-dock-status", PL_UNDOCKED ).toInt();
+        i_pl_dock = PL_UNDOCKED;
+/*        i_pl_dock = (pl_dock_e)getSettings()
+                         ->value( "pl-dock-status", PL_UNDOCKED ).toInt(); */
+
         if( i_pl_dock == PL_UNDOCKED )
         {
             playlistWidget->setWindowFlags( Qt::Window );