Do not save unloadable flag for submodule

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

diff --git a/src/modules/cache.c b/src/modules/cache.c
index db2ed69c32102d3a8b2774e98cb39b544ffa94de..24bf1dd63951b73dede16335485a9008e2f1db2f 100644 (file)
--- 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 c67362085b96ba6378e716f0dfac49c229b11546..861a07944b39a7443ce1cdd19cca33001e9ee945 100644 (file)
--- 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;