From c7ab8ea513fdc15a500dddcae01fa76cd07d0d84 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 7 Sep 2013 20:33:47 +0200 Subject: mplayer: don't auto-load explicitly loaded subtitle files Even if a subtitle was explicitly loaded with -sub, it was still auto- loaded (if auto-loading applied to that file). Fix this by explicitly checking whether a file is already loaded. The check is maximal naive and just compares the filenames as strings. The change in find_subfiles.c is so that "-sub something.ass" happens to work (auto-loading prepended a "./" to it, so the naive filename comparison check didn't work). --- sub/find_subfiles.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sub') diff --git a/sub/find_subfiles.c b/sub/find_subfiles.c index e81dca964a..f272e84e73 100644 --- a/sub/find_subfiles.c +++ b/sub/find_subfiles.c @@ -172,6 +172,10 @@ static void append_dir_subtitles(struct MPOpts *opts, MP_GROW_ARRAY(*slist, *nsub); struct subfn *sub = *slist + (*nsub)++; + // annoying and redundant + if (strncmp(subpath, "./", 2) == 0) + subpath += 2; + sub->priority = prio; sub->fname = subpath; } else -- cgit v1.2.3