Submodules do not inherit shortcuts anymore (fix: #2696)

[vlc] / src / modules / entry.c

diff --git a/src/modules/entry.c b/src/modules/entry.c
index 4fb35a65b8599bf8c1e6e4622b5373cc0e159e3f..647bf9d8b4932a3a234b952ca1e3e27e1d1ca3a0 100644 (file)
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -121,8 +121,9 @@ module_t *vlc_submodule_create (module_t *module)
     module->submodule_count++;
 
     /* Muahahaha! Heritage! Polymorphism! Ugliness!! */
-    memcpy (submodule->pp_shortcuts, module->pp_shortcuts,
-            sizeof (submodule->pp_shortcuts));
+    submodule->pp_shortcuts[0] = module->pp_shortcuts[0]; /* object name */
+    for (unsigned i = 1; i < MODULE_SHORTCUT_MAX; i++)
+        submodule->pp_shortcuts[i] = NULL;
 
     submodule->psz_object_name = strdup( module->psz_object_name );
     submodule->psz_shortname = module->psz_shortname;