From 9340c4daa66dc15d40eec98535977338e150c5b1 Mon Sep 17 00:00:00 2001 From: Edward Wang Date: Sun, 25 Mar 2012 01:17:03 -0400 Subject: [PATCH] Qt4: Account for rare case when video loads too quickly Close #6481 Signed-off-by: Jean-Baptiste Kempf --- modules/gui/qt4/main_interface.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp index 7a723622a7..8d952d2f8b 100644 --- a/modules/gui/qt4/main_interface.cpp +++ b/modules/gui/qt4/main_interface.cpp @@ -556,7 +556,9 @@ inline void MainInterface::showTab( QWidget *widget ) /* Embedded playlist -> Non-embedded playlist */ if( bgWidget == stackCentralOldWidget && widget == videoWidget ) { - playlistWidget->artContainer->removeWidget( videoWidget ); + /* In rare case when video is started before the interface */ + if( playlistWidget != NULL ) + playlistWidget->artContainer->removeWidget( videoWidget ); videoWidget->show(); videoWidget->raise(); stackCentralW->addWidget( videoWidget ); stackCentralW->setCurrentWidget( videoWidget ); -- 2.39.2