[vlc-commits] Do not save unloadable flag for submodule

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Aug 15 19:53:01 2011 +0300| [2458671ae290cd910624ebfc817dd0746e58d7a6] | committer: Rémi Denis-Courmont

Do not save unloadable flag for submodule

This property is fundamentally per-plugin, not per-submodule.

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

 src/modules/cache.c |    2 --
 src/modules/entry.c |    1 +
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/modules/cache.c b/src/modules/cache.c
index db2ed69..24bf1dd 100644
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -251,7 +251,6 @@ size_t CacheLoad( vlc_object_t *p_this, const char *dir, module_cache_t **r )
 
             LOAD_STRING(submodule->psz_capability);
             LOAD_IMMEDIATE(submodule->i_score);
-            LOAD_IMMEDIATE(submodule->b_unloadable);
         }
 
         char *path;
@@ -539,7 +538,6 @@ static int CacheSaveSubmodule( FILE *file, const module_t *p_module )
 
     SAVE_STRING( p_module->psz_capability );
     SAVE_IMMEDIATE( p_module->i_score );
-    SAVE_IMMEDIATE( p_module->b_unloadable );
     return 0;
 
 error:
diff --git a/src/modules/entry.c b/src/modules/entry.c
index c673620..861a079 100644
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -226,6 +226,7 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...)
             break;
 
         case VLC_MODULE_NO_UNLOAD:
+            assert (module->parent == NULL);
             module->b_unloadable = false;
             break;