vlc/vlc-2.2 | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Tue Dec 27 18:34:04 2016 +0100| [c6b757c112ce99e3ea851a22bbb6396071cac928] | committer: Jean-Baptiste Kempf
qt: controller: Don't connect the controller and MIM in a loop This ends up connecting the 2 way too many times (cherry picked from commit eea941425cc9a463841042627bf9d52ef1979a1c) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=c6b757c112ce99e3ea851a22bbb6396071cac928 --- modules/gui/qt4/components/controller.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp index c43d929..e7dcd1b 100644 --- a/modules/gui/qt4/components/controller.cpp +++ b/modules/gui/qt4/components/controller.cpp @@ -820,6 +820,8 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i, QWi screenRes = getSettings()->value( "FullScreen/screen" ).toRect(); isWideFSC = getSettings()->value( "FullScreen/wide" ).toBool(); i_screennumber = var_InheritInteger( p_intf, "qt-fullscreen-screennumber" ); + + CONNECT( this, fullscreenChanged( bool ), THEMIM, changeFullscreen( bool ) ); } FullscreenControllerWidget::~FullscreenControllerWidget() @@ -1174,7 +1176,6 @@ void FullscreenControllerWidget::setVoutList( vout_thread_t **pp_vout, int i_vou vout.append( p_vout ); var_AddCallback( p_vout, "fullscreen", FullscreenControllerWidgetFullscreenChanged, this ); - CONNECT( this, fullscreenChanged( bool ), THEMIM, changeFullscreen( bool ) ); /* I miss a add and fire */ fullscreenChanged( p_vout, var_GetBool( p_vout, "fullscreen" ), var_GetInteger( p_vout, "mouse-hide-timeout" ) ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
