]> git.sesse.net Git - vlc/commitdiff
Qt: do not emit signals from the MIM constructor
authorJean-Baptiste Kempf <jb@videolan.org>
Tue, 17 Mar 2015 17:03:17 +0000 (18:03 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 17 Mar 2015 17:03:17 +0000 (18:03 +0100)
Should close #14162

modules/gui/qt4/input_manager.cpp
modules/gui/qt4/qt4.cpp

index 0976e937b3c5da5e23eff277b8984ae2ce067236..749be0fab4a6eaf548a6b458659834b9ffd9c21a 100644 (file)
@@ -1035,11 +1035,6 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf )
     /* Warn our embedded IM about input changes */
     DCONNECT( this, inputChanged( input_thread_t * ),
               im, inputChangedHandler() );
-
-    /* initialize p_input (an input can already be running) */
-    p_input = playlist_CurrentInput( THEPL );
-    if( p_input )
-        emit inputChanged( p_input );
 }
 
 MainInputManager::~MainInputManager()
index 1122579b41c979333dc04e7622cacfd13ee3447f..43d7ba93eedce5fd53c6eb373cc53d4db46d8535 100644 (file)
@@ -499,7 +499,11 @@ static void *Thread( void *obj )
 
     /* Initialize the Dialog Provider and the Main Input Manager */
     DialogsProvider::getInstance( p_intf );
-    MainInputManager::getInstance( p_intf );
+    MainInputManager *mim = MainInputManager::getInstance( p_intf );
+    /* initialize p_input (an input can already be running) */
+    input_thread_t *p_input = playlist_CurrentInput( THEPL );
+    if( p_input )
+        mim->getIM()->inputChangedHandler();
 
 #ifdef UPDATE_CHECK
     /* Checking for VLC updates */