[vlc-commits] commit: Qt4: restart the playlist in the correct state when closed ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jul  4 00:26:53 2010 +0200| [5dafe612b9a008e471f4ce7fa028df50b5f58980] | committer: Jean-Baptiste Kempf 

Qt4: restart the playlist in the correct state when closed

Close #3788
(cherry picked from commit 3d80127ebdfc7d73b4ee3af2230e1d74e11adb3d)

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

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=5dafe612b9a008e471f4ce7fa028df50b5f58980
---

 modules/gui/qt4/components/playlist/playlist.cpp |    2 +-
 modules/gui/qt4/main_interface.cpp               |    7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/playlist.cpp b/modules/gui/qt4/components/playlist/playlist.cpp
index ea5495a..5368bf0 100644
--- a/modules/gui/qt4/components/playlist/playlist.cpp
+++ b/modules/gui/qt4/components/playlist/playlist.cpp
@@ -151,7 +151,7 @@ void PlaylistWidget::closeEvent( QCloseEvent *event )
 {
     if( THEDP->isDying() )
     {
-        /* FIXME is it needed ? */
+        p_intf->p_sys->p_mi->playlistVisible = true;
         event->accept();
     }
     else
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 5c36be7..91f0143 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -286,12 +286,7 @@ MainInterface::~MainInterface()
     settings->setValue( "pl-dock-status", b_plDocked );
     /* Save playlist state */
     if( playlistWidget )
-    {
-        settings->setValue( "playlist-visible",
-                            isPlDocked() ?
-                            playlistVisible :
-                            playlistWidget->isVisible() /* FIXME */ );
-    }
+        settings->setValue( "playlist-visible", playlistVisible );
 
     settings->setValue( "adv-controls",
                         getControlsVisibilityStatus() & CONTROLS_ADVANCED );