aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.ts2
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