From 7383b456823a2abd79fe2aaa3ae2c07f14ce3941 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 10 Sep 2016 13:51:17 +0200
Subject: command: do not call mp_switch_track() before proper initialization

This is an awful corner-case party, because we've started to allow the
user to send track-switching related commands before stream selection is
done in the loading stage. If mp_switch_track() is called before this
stream selection, it can behave inconsistently. So if we're in the
pre-loading phase, we must set the stream selection options to get
streams selected later, instead of calling this function. There seem to
be some annoying circumstances that exclude mp_switch_track() from
handling this logic too, so do it at all call-sites.
---
 player/command.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/player/command.c b/player/command.c
index e63e9181e5..f6a66e80e2 100644
--- a/player/command.c
+++ b/player/command.c
@@ -2173,7 +2173,7 @@ static int mp_property_program(void *ctx, struct m_property *prop,
     demux_program_t prog;
 
     struct demuxer *demuxer = mpctx->demuxer;
-    if (!demuxer)
+    if (!demuxer || !mpctx->playback_initialized)
         return M_PROPERTY_UNAVAILABLE;
 
     switch (action) {
@@ -5059,9 +5059,12 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re
         if (cmd->args[1].v.i == 2) {
             struct track *t = find_track_with_url(mpctx, type, cmd->args[0].v.s);
             if (t) {
-                mp_switch_track(mpctx, t->type, t, FLAG_MARK_SELECTION);
-                if (mpctx->playback_initialized)
+                if (mpctx->playback_initialized) {
+                    mp_switch_track(mpctx, t->type, t, FLAG_MARK_SELECTION);
                     print_track_list(mpctx, "Track switched:");
+                } else {
+                    opts->stream_id[0][t->type] = t->user_tid;
+                }
                 return 0;
             }
         }
@@ -5071,7 +5074,11 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re
         if (cmd->args[1].v.i == 1) {
             t->no_default = true;
         } else {
-            mp_switch_track(mpctx, t->type, t, FLAG_MARK_SELECTION);
+            if (mpctx->playback_initialized) {
+                mp_switch_track(mpctx, t->type, t, FLAG_MARK_SELECTION);
+            } else {
+                opts->stream_id[0][t->type] = t->user_tid;
+            }
         }
         char *title = cmd->args[2].v.s;
         if (title && title[0])
@@ -5098,6 +5105,10 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re
 
     case MP_CMD_SUB_RELOAD:
     case MP_CMD_AUDIO_RELOAD: {
+        if (mpctx->playback_initialized) {
+            MP_ERR(mpctx, "Cannot reload while not initialized.\n");
+            return -1;
+        }
         int type = cmd->id == MP_CMD_SUB_RELOAD ? STREAM_SUB : STREAM_AUDIO;
         struct track *t = mp_track_by_tid(mpctx, type, cmd->args[0].v.i);
         struct track *nt = NULL;
@@ -5119,7 +5130,7 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re
         if (!mpctx->playing)
             return -1;
         autoload_external_files(mpctx);
-        if (cmd->args[0].v.i) {
+        if (cmd->args[0].v.i && mpctx->playback_initialized) {
             // somewhat fuzzy and not ideal
             struct track *a = select_default_track(mpctx, 0, STREAM_AUDIO);
             if (a && a->is_external)
@@ -5128,8 +5139,7 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re
             if (s && s->is_external)
                 mp_switch_track(mpctx, STREAM_SUB, s, 0);
 
-            if (mpctx->playback_initialized)
-                print_track_list(mpctx, "Track list:\n");
+            print_track_list(mpctx, "Track list:\n");
         }
         break;
     }
-- 
cgit v1.2.3