[vlc-devel] commit: Submodules do not inherit shortcuts anymore (fix: #2696) ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Apr 26 18:46:50 CEST 2009


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Apr 26 19:16:58 2009 +0300| [97fec5825cf7ad4f541ca0a4dc926739534dd7c3] | committer: Rémi Denis-Courmont 

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

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

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

diff --git a/src/modules/entry.c b/src/modules/entry.c
index 4fb35a6..647bf9d 100644
--- 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;




More information about the vlc-devel mailing list