[vlc-devel] commit: LUA: check libdir before datadir ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Feb 14 20:17:28 CET 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Feb 14 21:17:09 2010 +0200| [caa3a6c5f4c85ee138827d2db771e2778b000b14] | committer: Rémi Denis-Courmont 

LUA: check libdir before datadir

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

 modules/misc/lua/vlc.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c
index 9ebf988..017eabf 100644
--- a/modules/misc/lua/vlc.c
+++ b/modules/misc/lua/vlc.c
@@ -162,6 +162,12 @@ int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname,
         i++;
     free( datadir );
 
+#if !(defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32))
+    if( likely(asprintf( &ppsz_dir_list[i], "%s"DIR_SEP"lua"DIR_SEP"%s",
+                         config_GetLibDir(), luadirname ) != -1) )
+            i++;
+#endif
+
     char *psz_datapath = config_GetDataDir( p_this );
     if( likely(psz_datapath != NULL) )
     {
@@ -178,12 +184,6 @@ int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname,
         free( psz_datapath );
     }
 
-#if !(defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32))
-    if( likely(asprintf( &ppsz_dir_list[i], "%s"DIR_SEP"lua"DIR_SEP"%s",
-                         config_GetLibDir(), luadirname ) != -1) )
-            i++;
-#endif
-
     ppsz_dir_list[i] = NULL;
     return VLC_SUCCESS;
 }




More information about the vlc-devel mailing list