[vlc-commits] lua: hack to prevent the cli submodule from taking over the generic module

[Pierre Ynard]

vlc/vlc-1.2 | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Sat Dec  3 19:47:29 2011 +0100| [2392e243c06f43d6248133c08a2daed64604b4d7] | committer: Pierre Ynard

lua: hack to prevent the cli submodule from taking over the generic module

This fixes the `vlc -I lua` syntax

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=2392e243c06f43d6248133c08a2daed64604b4d7
---

 modules/lua/intf.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/modules/lua/intf.c b/modules/lua/intf.c
index d1d1d14..67675d2 100644
--- a/modules/lua/intf.c
+++ b/modules/lua/intf.c
@@ -428,6 +428,12 @@ int Open_LuaHTTP( vlc_object_t *p_this )
 
 int Open_LuaCLI( vlc_object_t *p_this )
 {
+    /* Hack to work around submodule brokenness */
+    intf_thread_t *p_intf = (intf_thread_t*)p_this;
+    if( !strcmp( p_intf->psz_intf, "lua" )
+        || !strncmp( p_intf->psz_intf, "lua,", 4 ) )
+        return VLC_EGENERIC;
+
     return Start_LuaIntf( p_this, "cli" );
 }