1 files changed, 3 insertions, 4 deletions
diff --git a/mplayer.c b/mplayer.c
index 3423813deb..b061680012 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1957,11 +1957,10 @@ static int select_subtitle(MPContext *mpctx)
 
   if (!found && opts->sub_id == -1) {
     // finally select subs by language and container hints
-    if (opts->sub_id == -1 && opts->sub_lang)
-      opts->sub_id = demuxer_sub_track_by_lang(mpctx->d_sub->demuxer,
-                                               opts->sub_lang);
     if (opts->sub_id == -1)
-      opts->sub_id = demuxer_default_sub_track(mpctx->d_sub->demuxer);
+      opts->sub_id =
+          demuxer_sub_track_by_lang_and_default(mpctx->d_sub->demuxer,
+                                                opts->sub_lang);
     if (opts->sub_id >= 0) {
       id = opts->sub_id;
       found = mp_property_do("sub_demux", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK;