Commit 11fb6b16 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Finish "core" renaming to avoid prefs crashes

Close #10096
parent 78808506
...@@ -67,11 +67,11 @@ VLC_API const char * module_gettext( const module_t *, const char * ) VLC_USED; ...@@ -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) 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() #define module_get_main(a) module_get_main()
VLC_USED static inline bool module_is_main( const module_t * p_module ) 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" );
} }
...@@ -547,7 +547,7 @@ void ModuleConfigControl::finish( ) ...@@ -547,7 +547,7 @@ void ModuleConfigControl::finish( )
{ {
module_t *p_parser = p_list[i]; 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; unsigned confsize;
module_config_t *p_config; module_config_t *p_config;
...@@ -662,7 +662,7 @@ void ModuleListConfigControl::finish( bool bycat ) ...@@ -662,7 +662,7 @@ void ModuleListConfigControl::finish( bool bycat )
if( bycat ) if( bycat )
{ {
if( !strcmp( module_get_object( p_parser ), "main" ) ) continue; if( !strcmp( module_get_object( p_parser ), "core" ) ) continue;
unsigned confsize; unsigned confsize;
module_config_t *p_config = module_config_get (p_parser, &confsize); module_config_t *p_config = module_config_get (p_parser, &confsize);
......
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