vlc/vlc-2.0 | branch: master | Erwan Tulou <[email protected]> | Tue Feb 21 16:39:58 2012 +0100| [345e93b0d10a81e0aba5bb6c32f740adaa33c9ec] | committer: Jean-Baptiste Kempf
qt4: fix the main input manager initialization. This fixes a bug reported on the forum at http://forum.videolan.org/viewtopic.php?f=2&t=98332 (cherry picked from commit 0c1f7006bd6f4915d20d14a411ac1854aa5d7703) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=345e93b0d10a81e0aba5bb6c32f740adaa33c9ec --- modules/gui/qt4/input_manager.cpp | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp index 3320263..4281c30 100644 --- a/modules/gui/qt4/input_manager.cpp +++ b/modules/gui/qt4/input_manager.cpp @@ -955,6 +955,14 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf ) DCONNECT( this, inputChanged( input_thread_t * ), im, setInput( input_thread_t * ) ); + /* initialize p_input (an input can already be running) */ + p_input = playlist_CurrentInput( pl_Get(p_intf) ); + if( p_input ) + { + if( !p_intf->p_sys->b_isDialogProvider ) + var_AddCallback( p_input, "state", PLItemChanged, this ); + emit inputChanged( p_input ); + } } MainInputManager::~MainInputManager() _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
