]> git.sesse.net Git - vlc/commitdiff
Qt: main interface, small fixes
authorJakob Leben <jleben@videolan.org>
Wed, 31 Mar 2010 03:47:28 +0000 (05:47 +0200)
committerJakob Leben <jleben@videolan.org>
Thu, 1 Apr 2010 12:00:30 +0000 (14:00 +0200)
modules/gui/qt4/main_interface.cpp

index 1b9c38cacdc623ffaef5438551516749d977dd7d..706186c2e2e65d5e140636a89e061b3090538446 100644 (file)
@@ -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;
 }
 
 /*