From: Rémi Denis-Courmont <remi@remlab.net>
Date: Fri, 28 Sep 2012 15:10:20 +0000 (+0300)
Subject: modules: initialize static modules at the same time as dynamic ones
X-Git-Tag: 2.1.0-git~2745
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f74645ce3b38c1156df114808039203ce6fff951;p=vlc

modules: initialize static modules at the same time as dynamic ones
---

diff --git a/src/modules/bank.c b/src/modules/bank.c
index 5d99a6e761..9e182c68e2 100644
--- a/src/modules/bank.c
+++ b/src/modules/bank.c
@@ -112,8 +112,6 @@ void module_InitBank (void)
         module_t *module = module_InitStatic (vlc_entry__main);
         if (likely(module != NULL))
             module_StoreBank (module);
-
-        module_InitStaticModules();
         config_SortConfig ();
     }
     modules.usage++;
@@ -180,15 +178,16 @@ size_t module_LoadPlugins (vlc_object_t *obj)
 {
     /*vlc_assert_locked (&modules.lock); not for static mutexes :( */
 
-#ifdef HAVE_DYNAMIC_PLUGINS
     if (modules.usage == 1)
     {
+        module_InitStaticModules ();
+#ifdef HAVE_DYNAMIC_PLUGINS
         msg_Dbg (obj, "searching plug-in modules");
         AllocateAllPlugins (obj);
+#endif
         config_UnsortConfig ();
         config_SortConfig ();
     }
-#endif
     vlc_mutex_unlock (&modules.lock);
 
     size_t count;