summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-10-06 21:54:00 +0200
committerwm4 <wm4@nowhere>2013-10-06 21:54:00 +0200
commit2d638347c1d9dac8738792a59a52cb281f110653 (patch)
tree1f6879c6baaf18b9f75ca6e9488ed20b67bcd0ca
parent2119bcbeacb4785130215c0903cce150997cba71 (diff)
downloadmpv-2d638347c1d9dac8738792a59a52cb281f110653.tar.bz2
mpv-2d638347c1d9dac8738792a59a52cb281f110653.tar.xz
mplayer: don't resume playlist if --no-resume-playback is used
-rw-r--r--mpvcore/mplayer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c
index 4d3f24d057..7de8ff2abf 100644
--- a/mpvcore/mplayer.c
+++ b/mpvcore/mplayer.c
@@ -921,6 +921,8 @@ static void load_playback_resume(m_config_t *conf, const char *file)
struct playlist_entry *mp_resume_playlist(struct playlist *playlist,
struct MPOpts *opts)
{
+ if (!opts->position_resume)
+ return NULL;
for (struct playlist_entry *e = playlist->first; e; e = e->next) {
char *conf = get_playback_resume_config_filename(e->filename, opts);
bool exists = conf && mp_path_exists(conf);