vlc/vlc-2.2 | branch: master | Hannes Domani <[email protected]> | Tue Feb 23 
20:13:54 2016 +0100| [db73b7f2e11c8994ac0e35ada12d8ed27123025d] | committer: 
Jean-Baptiste Kempf

qt: prevent infinite recursion

Close #15630

Signed-off-by: Jean-Baptiste Kempf <[email protected]>
(cherry picked from commit e93087fa20d7a697c3f93832b6b2085c6bb7dbc3)
Signed-off-by: Jean-Baptiste Kempf <[email protected]>

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

 modules/gui/qt4/components/controller.cpp |    1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/gui/qt4/components/controller.cpp 
b/modules/gui/qt4/components/controller.cpp
index 6624509..7ea4939 100644
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
@@ -399,6 +399,7 @@ QWidget *AbstractController::createWidget( buttonType_e 
button, int options )
         }
         break;
     case ADVANCED_CONTROLLER:
+        if( qobject_cast<AdvControlsWidget *>(this) == NULL )
         {
             advControls = new AdvControlsWidget( p_intf, this );
             widget = advControls;

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to