github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-14 22:48:35 +01:00
Code Releases Activity

player: make failure to load scripts non-fatal again

Browse Source 
Restore the behavior from a few commits ago. I decided that it's strange
that this is fatal, since e.g. config file errors are also non-fatal.
This commit is contained in:
wm4 2020-01-20 19:58:31 +01:00
parent 65f3c7453d
commit 1ea145a9a1
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
player/main.c
View File

@ -433,8 +433,7 @@ int mp_initialize(struct MPContext *mpctx, char **options)
MP_WARN(mpctx, "There will be no OSD and no text subtitles.\n"); MP_WARN(mpctx, "There will be no OSD and no text subtitles.\n");
#endif #endif
if (!mp_load_scripts(mpctx)) mp_load_scripts(mpctx);
return -1;
if (opts->force_vo == 2 && handle_force_window(mpctx, false) < 0) if (opts->force_vo == 2 && handle_force_window(mpctx, false) < 0)
return -1; return -1;