[vlc-commits] Qt: main_interface: fix showTab(oldwidget) for undocked playlist (fix #6794 )

[Francois Cartegnie]

vlc/vlc-2.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sat May 12 16:02:26 2012 +0200| [a8cc195912e60e5cc630762f8c7b2ed59a371215] | committer: Jean-Baptiste Kempf

Qt: main_interface: fix showTab(oldwidget) for undocked playlist (fix #6794)
(cherry picked from commit 0ef62578e5b6e06e67868e8a9e2ac11d4436b5da)

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

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

 modules/gui/qt4/main_interface.cpp |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 8ea980d..b3633e1 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -528,6 +528,11 @@ inline void MainInterface::showTab( QWidget *widget )
 #ifdef DEBUG_INTF
     msg_Warn( p_intf, "Old stackCentralOldWidget %i", stackCentralW->indexOf( stackCentralOldWidget ) );
 #endif
+    /* fixing when the playlist has been undocked after been hidden.
+       restoreStackOldWidget() is called when video stops but
+       stackCentralOldWidget would still be pointing to playlist */
+    if ( widget == playlistWidget && !isPlDocked() )
+        widget = bgWidget;
 
     stackCentralOldWidget = stackCentralW->currentWidget();
     stackWidgetsSizes[stackCentralOldWidget] = stackCentralW->size();