From c1f46dbbe9a9b2d1ae6694118244bea8859ab2f0 Mon Sep 17 00:00:00 2001 From: Ricardo Constantino Date: Fri, 30 Jun 2017 14:53:33 +0100 Subject: scripting: add wrapper to load scripts with user paths Fixes regression since b2f756c80e, which broke load-script command when used with user paths (ex: ~~/script.lua) --- player/scripting.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'player/scripting.c') diff --git a/player/scripting.c b/player/scripting.c index dc8e7d5b2b..5651950a42 100644 --- a/player/scripting.c +++ b/player/scripting.c @@ -155,6 +155,14 @@ int mp_load_script(struct MPContext *mpctx, const char *fname) return 0; } +int mp_load_user_script(struct MPContext *mpctx, const char *fname) +{ + char *path = mp_get_user_path(NULL, mpctx->global, fname); + int ret = mp_load_script(mpctx, path); + talloc_free(path); + return ret; +} + static int compare_filename(const void *pa, const void *pb) { char *a = (char *)pa; @@ -219,11 +227,8 @@ 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]) { - char *path = mp_get_user_path(NULL, mpctx->global, files[n]); - mp_load_script(mpctx, path); - talloc_free(path); - } + if (files[n][0]) + mp_load_user_script(mpctx, files[n]); } if (!mpctx->opts->auto_load_scripts) return; -- cgit v1.2.3