From 94441ed13963356fa25f7e52a12e36387220ebba Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 4 May 2014 10:31:24 +0200
Subject: options: merge ---sub-auto-match with --sub-auto

There's no reason why these should be separate.
---
 player/loadfile.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'player/loadfile.c')

diff --git a/player/loadfile.c b/player/loadfile.c
index 6319d092ce..e460c0ac69 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -714,7 +714,7 @@ static void open_subtitles_from_options(struct MPContext *mpctx)
         for (int i = 0; mpctx->opts->sub_name[i] != NULL; ++i)
             mp_add_subtitles(mpctx, mpctx->opts->sub_name[i]);
     }
-    if (mpctx->opts->sub_auto) { // auto load sub file ...
+    if (mpctx->opts->sub_auto >= 0) { // auto load sub file ...
         void *tmp = talloc_new(NULL);
         char *base_filename = mpctx->filename;
         char *stream_filename = NULL;
-- 
cgit v1.2.3