Commit 0e89cd61 authored by Erwan Tulou's avatar Erwan Tulou

Qt: early instantiation for THEMIM

Rather than wait for the first call to THEMIM to instantiate this singleton,
do it explicitly at an early stage of the plugin initialization.

This is useful for Qt as a dialog provider, since otherwise THEMIM doesn't
get a chance to be set up until, e.g. the first call to a popupmenu,
which then makes this menu slightly longer and noticeable to display.

Also, remove the unneeded instantiation in the main_interface. (THEMIM has
already been used a few lines earlier, which makes the call useless).
parent 4107b253
......@@ -169,11 +169,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
createStatusBar();
setStatusBarVisibility( getSettings()->value( "MainWindow/status-bar-visible", false ).toBool() );
/********************
* Input Manager *
********************/
MainInputManager::getInstance( p_intf );
#ifdef _WIN32
himl = NULL;
p_taskbl = NULL;
......
......@@ -486,8 +486,9 @@ static void *Thread( void *obj )
app.setWindowIcon( QIcon::fromTheme( "vlc", QIcon( ":/logo/vlc256.png" ) ) );
#endif
/* Initialize timers and the Dialog Provider */
/* Initialize the Dialog Provider and the Main Input Manager */
DialogsProvider::getInstance( p_intf );
MainInputManager::getInstance( p_intf );
#ifdef UPDATE_CHECK
/* Checking for VLC updates */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment