diff options
| author | Hoyon Mak <hoyon.mak@gmail.com> | 2017-06-09 18:03:39 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-06-09 19:42:12 +0200 |
| commit | b2f756c80e71fb9ceb4fbd94f445ebbbff82703f (patch) | |
| tree | ba3765af92627185cd6d1b03070d50b39fe64844 /player | |
| parent | d8a3b10f45eb10fb34ce9da3a9a76e3bd8644e3d (diff) | |
| download | mpv-b2f756c80e71fb9ceb4fbd94f445ebbbff82703f.tar.bz2 mpv-b2f756c80e71fb9ceb4fbd94f445ebbbff82703f.tar.xz | |
scripting: expand --script filename for C plugins
Diffstat (limited to 'player')
| -rw-r--r-- | player/lua.c | 6 | ||||
| -rw-r--r-- | player/scripting.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/player/lua.c b/player/lua.c index 35f07ef663..b3e4fe8317 100644 --- a/player/lua.c +++ b/player/lua.c @@ -190,10 +190,8 @@ static void add_functions(struct script_ctx *ctx); static void load_file(lua_State *L, const char *fname) { struct script_ctx *ctx = get_ctx(L); - char *res_name = mp_get_user_path(NULL, ctx->mpctx->global, fname); - MP_VERBOSE(ctx, "loading file %s\n", res_name); - int r = luaL_loadfile(L, res_name); - talloc_free(res_name); // careful to not leak this on Lua errors + MP_VERBOSE(ctx, "loading file %s\n", fname); + int r = luaL_loadfile(L, fname); if (r) lua_error(L); lua_call(L, 0, 0); diff --git a/player/scripting.c b/player/scripting.c index 092404231d..46379b4151 100644 --- a/player/scripting.c +++ b/player/scripting.c @@ -215,8 +215,11 @@ void mp_load_scripts(struct MPContext *mpctx) // Load scripts from options char **files = mpctx->opts->script_files; for (int n = 0; files && files[n]; n++) { - if (files[n][0]) - mp_load_script(mpctx, files[n]); + if (files[n][0]) { + char *path = mp_get_user_path(NULL, mpctx->global, files[n]); + mp_load_script(mpctx, path); + talloc_free(path); + } } if (!mpctx->opts->auto_load_scripts) return; |