From 0a4fc15d26e8a8b8e75de417fd745088a8eb72a1 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 21 Jan 2014 21:23:42 +0100 Subject: lua: allow ~ path convention for --lua Paths passed to the --lua option now follow the convention for paths starting with ~ documented in mpv.rst. --- player/lua.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'player') diff --git a/player/lua.c b/player/lua.c index ca92aa009d..79bf61b713 100644 --- a/player/lua.c +++ b/player/lua.c @@ -134,11 +134,13 @@ static int load_file(struct script_ctx *ctx, const char *fname) { int r = 0; lua_State *L = ctx->state; - if (luaL_loadfile(L, fname) || lua_pcall(L, 0, 0, 0)) { + char *res_name = mp_get_user_path(NULL, ctx->mpctx->global, fname); + if (luaL_loadfile(L, res_name) || lua_pcall(L, 0, 0, 0)) { report_error(L); r = -1; } assert(lua_gettop(L) == 0); + talloc_free(res_name); return r; } -- cgit v1.2.3