Commit c744b977 authored by bigben's avatar bigben
Browse files

* Revert 15357, as it would make vlc crash if you try to load a main interface that doesn't exist

* Instead, use "screensaver,none" when trying to load the screensaver interface
* Same fix for onther interfaces loaded by libvlc
parent 13f91aa0
......@@ -115,7 +115,7 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module,
}
/* Choose the best module */
p_intf->p_module = module_Need( p_intf, "interface", psz_module, VLC_TRUE );
p_intf->p_module = module_Need( p_intf, "interface", psz_module, VLC_FALSE );
if( p_intf->p_module == NULL )
{
......
......@@ -772,30 +772,30 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
#ifdef HAVE_X11_XLIB_H
if( config_GetInt( p_vlc, "disable-screensaver" ) == 1 )
{
VLC_AddIntf( 0, "screensaver", VLC_FALSE, VLC_FALSE );
VLC_AddIntf( 0, "screensaver,none", VLC_FALSE, VLC_FALSE );
}
#endif
if( config_GetInt( p_vlc, "file-logging" ) == 1 )
{
VLC_AddIntf( 0, "logger", VLC_FALSE, VLC_FALSE );
VLC_AddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE );
}
#ifdef HAVE_SYSLOG_H
if( config_GetInt( p_vlc, "syslog" ) == 1 )
{
char *psz_logmode = "logmode=syslog";
AddIntfInternal( 0, "logger", VLC_FALSE, VLC_FALSE, 1, &psz_logmode );
AddIntfInternal( 0, "logger,none", VLC_FALSE, VLC_FALSE, 1, &psz_logmode );
}
#endif
if( config_GetInt( p_vlc, "show-intf" ) == 1 )
{
VLC_AddIntf( 0, "showintf", VLC_FALSE, VLC_FALSE );
VLC_AddIntf( 0, "showintf,none", VLC_FALSE, VLC_FALSE );
}
if( config_GetInt( p_vlc, "network-synchronisation") == 1 )
{
VLC_AddIntf( 0, "netsync", VLC_FALSE, VLC_FALSE );
VLC_AddIntf( 0, "netsync,none", VLC_FALSE, VLC_FALSE );
}
/*
......
Supports Markdown
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