[vlc-commits] commit: Qt: main interface, small fixes (Jakob Leben )

[git at videolan.org]

vlc | branch: master | Jakob Leben <jleben at videolan.org> | Wed Mar 31 05:47:28 2010 +0200| [d42976199eebe4fd92ecd4e77294d42633e81b3b] | committer: Jakob Leben 

Qt: main interface, small fixes

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

 modules/gui/qt4/main_interface.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 1b9c38c..706186c 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -607,7 +607,8 @@ void MainInterface::releaseVideoSlot( void )
 {
     videoWidget->release();
 
-    restoreStackOldWidget();
+    if( stackCentralW->currentWidget() == videoWidget )
+        restoreStackOldWidget();
 
     /* We don't want to have a blank video to popup */
     stackCentralOldWidget = bgWidget;
@@ -718,8 +719,9 @@ void MainInterface::dockPlaylist( bool p_docked )
         playlistWidget->setWindowFlags( Qt::Widget ); // Probably a Qt bug here
         // It would be logical that QStackWidget::addWidget reset the flags...
         stackCentralW->addWidget( playlistWidget );
-        stackCentralW->setCurrentWidget( playlistWidget );
+        showTab( playlistWidget );
     }
+    playlistVisible = true;
 }
 
 /*