Skip to content

Commit

Permalink
Finish "core" renaming to avoid prefs crashes
Browse files Browse the repository at this point in the history
Close #10096
  • Loading branch information
jbkempf committed Dec 10, 2013
1 parent 7880850 commit 11fb6b1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions include/vlc_modules.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 2 deletions modules/gui/qt4/components/preferences_widgets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 11fb6b1

Please sign in to comment.