summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--player/command.c2
-rw-r--r--player/loadfile.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/player/command.c b/player/command.c
index 87f4061fe6..fff34fad5b 100644
--- a/player/command.c
+++ b/player/command.c
@@ -4588,7 +4588,7 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re
case MP_CMD_STOP:
playlist_clear(mpctx->playlist);
- if (!mpctx->stop_play)
+ if (mpctx->stop_play != PT_QUIT)
mpctx->stop_play = PT_STOP;
break;
diff --git a/player/loadfile.c b/player/loadfile.c
index 40f35472e7..c472cad344 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1097,7 +1097,7 @@ reopen_file:
}
open_demux_reentrant(mpctx);
- if (!mpctx->master_demuxer)
+ if (!mpctx->master_demuxer || mpctx->stop_play)
goto terminate_playback;
mpctx->demuxer = mpctx->master_demuxer;