From caa3a6c5f4c85ee138827d2db771e2778b000b14 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 14 Feb 2010 21:17:09 +0200 Subject: [PATCH] LUA: check libdir before datadir --- modules/misc/lua/vlc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c index 9ebf9887c7..017eabfdd6 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; } -- 2.39.5