Browse Source

Finish "core" renaming to avoid prefs crashes

Close #10096
pull/10/head
Jean-Baptiste Kempf 13 years ago
parent
commit
11fb6b16e9
  1. 4
      include/vlc_modules.h
  2. 4
      modules/gui/qt4/components/preferences_widgets.cpp

4
include/vlc_modules.h

@ -67,11 +67,11 @@ VLC_API const char * module_gettext( const module_t *, const char * ) VLC_USED;
VLC_USED static inline module_t *module_get_main (void)
{
return module_find ("main");
return module_find ("core");
}
#define module_get_main(a) module_get_main()
VLC_USED static inline bool module_is_main( const module_t * p_module )
{
return !strcmp( module_get_object( p_module ), "main" );
return !strcmp( module_get_object( p_module ), "core" );
}

4
modules/gui/qt4/components/preferences_widgets.cpp

@ -547,7 +547,7 @@ void ModuleConfigControl::finish( )
{
module_t *p_parser = p_list[i];
if( !strcmp( module_get_object( p_parser ), "main" ) ) continue;
if( !strcmp( module_get_object( p_parser ), "core" ) ) continue;
unsigned confsize;
module_config_t *p_config;
@ -662,7 +662,7 @@ void ModuleListConfigControl::finish( bool bycat )
if( bycat )
{
if( !strcmp( module_get_object( p_parser ), "main" ) ) continue;
if( !strcmp( module_get_object( p_parser ), "core" ) ) continue;
unsigned confsize;
module_config_t *p_config = module_config_get (p_parser, &confsize);

Loading…
Cancel
Save