From: Rigel Kent <sendmemail@rigelk.eu>
Date: Wed, 11 Dec 2019 19:24:17 +0000 (+0100)
Subject: make playlists ignore user history
X-Git-Tag: v2.1.0-rc.1~214
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=12f18b90ba6395464606052bb1bdfedb6b83df13;p=github%2FChocobozzz%2FPeerTube.git

make playlists ignore user history
---

diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index f13acec40..92c1c50c0 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -570,7 +570,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
   }) {
     const { video, videoCaptions, urlOptions, user } = params
 
-    let startTime = timeToInt(urlOptions.startTime) || (video.userHistory ? video.userHistory.currentTime : 0)
+    let startTime = timeToInt(urlOptions.startTime) || (video.userHistory && !this.playlist ? video.userHistory.currentTime : 0)
     // If we are at the end of the video, reset the timer
     if (video.duration - startTime <= 1) startTime = 0