diff options
| author |  wm4 <wm4@nowhere> | 2016-09-26 14:50:20 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-09-26 16:49:35 +0200 |
| commit | a314b1013fc148d1038129b0bda3b6a3cc85ed2a (patch) | |
| tree | ef91e7c314b3e058a3775307fde9a1c996023e0f /player/scripting.c | |
| parent | 0f110ad0e27583c5161cf27a3c17d1563253b368 (diff) | |
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.
Diffstat (limited to 'player/scripting.c')
| -rw-r--r-- | player/scripting.c | 1 |
1 files changed, 0 insertions, 1 deletions
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]) |