Unified · Split
| @@ -1679,10 +1679,12 @@ static void play_current_file(struct MPContext *mpctx) · 1678 unmodified lines | |||
| 1679 | if (!mpctx->demuxer || mpctx->stop_play) | 1679 | if (!mpctx->demuxer || mpctx->stop_play) |
| 1680 | goto terminate_playback; | 1680 | goto terminate_playback; |
| 1681 | 1681 | ||
| 1682 | if (mpctx->demuxer->playlist) { | 1682 | struct playlist *pl = mpctx->demuxer->playlist; |
| 1683 | if (watch_later) | 1683 | if (pl) { |
| 1684 | // pl->playlist_dir indicates that the playlist was auto-created from | ||
| 1685 | // the parent file. In this case, mpctx->filename points to real file. | ||
| 1686 | if (watch_later && !pl->playlist_dir) | ||
| 1684 | mp_delete_watch_later_conf(mpctx, mpctx->filename); | 1687 | mp_delete_watch_later_conf(mpctx, mpctx->filename); |
| 1685 | struct playlist *pl = mpctx->demuxer->playlist; | ||
| 1686 | playlist_populate_playlist_path(pl, mpctx->filename); | 1688 | playlist_populate_playlist_path(pl, mpctx->filename); |
| 1687 | if (infinite_playlist_loading_loop(mpctx, pl)) { | 1689 | if (infinite_playlist_loading_loop(mpctx, pl)) { |
| 1688 | mpctx->stop_play = PT_STOP; | 1690 | mpctx->stop_play = PT_STOP; |