mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 03:52:22 +02:00
Code

scripting: fix/improve deprecation message

Browse Source 
The message was missing a '\n', so it was merged with the next line,
which also typically caused it not to be printed with the colors for
warnings.

Print the full new path in the warning message. (Normally, cfg should
never be NULL, so accounting for this case is just for robustness.)
This commit is contained in:
wm4 2014-12-15 06:24:05 +01:00
parent 1c2cbeabc2
commit fcec3df700
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
player/scripting.c
View File

@ -198,9 +198,12 @@ void mp_load_scripts(struct MPContext *mpctx)
for (int n = 0; files && files[n]; n++) {
if (s && !warning_displayed) {
warning_displayed = 1;
MP_WARN(mpctx,
"warning: '%s' - '%s' dirs are deprecated. Please move scripts to '%s'.",
files[n], dirs[s], dirs[0]);
char *cfg = mp_find_config_file(tmp, mpctx->global, "");
if (cfg)
cfg = mp_path_join(tmp, bstr0(cfg), bstr0("scripts"));
MP_WARN(mpctx, "Warning: '%s' - lua subdir is deprecated.\n"
"Please move scripts to '%s'.\n",
files[n], cfg ? cfg : "/scripts");
}
mp_load_script(mpctx, files[n]);
}