[vlc-commits] Finish "core" renaming to avoid prefs crashes

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Dec 10 11:37:54 2013 +0100| [11fb6b16e908ef0fd0f50c53ef363f6dca30fbaf] | committer: Jean-Baptiste Kempf

Finish "core" renaming to avoid prefs crashes

Close #10096

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=11fb6b16e908ef0fd0f50c53ef363f6dca30fbaf
---

 include/vlc_modules.h                              |    4 ++--
 modules/gui/qt4/components/preferences_widgets.cpp |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/vlc_modules.h b/include/vlc_modules.h
index d152f25..7f45217 100644
--- a/include/vlc_modules.h
+++ b/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" );
 }
diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 8af40af..f7b0a53 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/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);