diff options
| author | Rigel Kent <sendmemail@rigelk.eu> | 2019-12-11 20:24:17 +0100 |
|---|---|---|
| committer | Chocobozzz <chocobozzz@cpy.re> | 2019-12-13 09:13:43 +0100 |
| commit | 12f18b90ba6395464606052bb1bdfedb6b83df13 (patch) | |
| tree | 4174378491776142be85c41cb885b6265f9f4cbe /client/src/app/videos/+video-watch/video-watch.component.ts | |
| parent | bee29df8a9ba3090be3daa8ff806dd9a26d7a5cf (diff) | |
| download | PeerTube-12f18b90ba6395464606052bb1bdfedb6b83df13.tar.gz PeerTube-12f18b90ba6395464606052bb1bdfedb6b83df13.tar.zst PeerTube-12f18b90ba6395464606052bb1bdfedb6b83df13.zip | |
make playlists ignore user history
Diffstat (limited to 'client/src/app/videos/+video-watch/video-watch.component.ts')
| -rw-r--r-- | client/src/app/videos/+video-watch/video-watch.component.ts | 2 |
1 files changed, 1 insertions, 1 deletions
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 { | |||
| 570 | }) { | 570 | }) { |
| 571 | const { video, videoCaptions, urlOptions, user } = params | 571 | const { video, videoCaptions, urlOptions, user } = params |
| 572 | 572 | ||
| 573 | let startTime = timeToInt(urlOptions.startTime) || (video.userHistory ? video.userHistory.currentTime : 0) | 573 | let startTime = timeToInt(urlOptions.startTime) || (video.userHistory && !this.playlist ? video.userHistory.currentTime : 0) |
| 574 | // If we are at the end of the video, reset the timer | 574 | // If we are at the end of the video, reset the timer |
| 575 | if (video.duration - startTime <= 1) startTime = 0 | 575 | if (video.duration - startTime <= 1) startTime = 0 |
| 576 | 576 | ||