summaryrefslogtreecommitdiffstats
path: root/player/loadfile.c
diff options
context:
space:
mode:
Diffstat (limited to 'player/loadfile.c')
-rw-r--r--player/loadfile.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 9adf1fec87..76a28c270f 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1118,10 +1118,13 @@ goto_reopen_demuxer: ;
load_timeline(mpctx);
if (mpctx->demuxer->playlist) {
- int entry_stream_flags =
- (mpctx->demuxer->stream->safe_origin ? 0 : STREAM_SAFE_ONLY) |
- (mpctx->demuxer->stream->is_network ? STREAM_NETWORK_ONLY : 0);
struct playlist *pl = mpctx->demuxer->playlist;
+ int entry_stream_flags = 0;
+ if (!pl->disable_safety) {
+ entry_stream_flags = STREAM_SAFE_ONLY;
+ if (mpctx->demuxer->stream->is_network)
+ entry_stream_flags |= STREAM_NETWORK_ONLY;
+ }
for (struct playlist_entry *e = pl->first; e; e = e->next)
e->stream_flags |= entry_stream_flags;
transfer_playlist(mpctx, pl);