From a314b1013fc148d1038129b0bda3b6a3cc85ed2a Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 26 Sep 2016 14:50:20 +0200 Subject: scripting: don't attempt to load builtin scripts twice During init it will first call mp_load_builtin_scripts(), and then again via mp_load_scripts(). This was harmless (a second attempt won't load it again if the first one was successful), but it's unnecessary, and also looks confusing if the scripts failed to load the first time. --- player/scripting.c | 1 - 1 file changed, 1 deletion(-) diff --git a/player/scripting.c b/player/scripting.c index 76395c6ad6..4b92f7bf1b 100644 --- a/player/scripting.c +++ b/player/scripting.c @@ -210,7 +210,6 @@ void mp_load_builtin_scripts(struct MPContext *mpctx) void mp_load_scripts(struct MPContext *mpctx) { // Load scripts from options - mp_load_builtin_scripts(mpctx); char **files = mpctx->opts->script_files; for (int n = 0; files && files[n]; n++) { if (files[n][0]) -- cgit v1.2.3