2 files changed, 19 insertions, 0 deletions

diff --git a/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.ts b/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.ts
index fbf9a3687..b44238310 100644
--- a/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.ts
@@ -143,6 +143,14 @@ export class VideoWatchPlaylistComponent {
     this.onPlaylistVideosNearOfBottom(position)
   }
 
+  hasPreviousVideo () {
+    return !!this.findPlaylistVideo(this.currentPlaylistPosition - 1, 'previous')
+  }
+
+  hasNextVideo () {
+    return !!this.findPlaylistVideo(this.currentPlaylistPosition + 1, 'next')
+  }
+
   navigateToPreviousPlaylistVideo () {
     const previous = this.findPlaylistVideo(this.currentPlaylistPosition - 1, 'previous')
     if (!previous) return
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 d542f243c..d3d04d236 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
@@ -474,6 +474,14 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     })
   }
 
+  private hasNextVideo () {
+    if (this.playlist) {
+      return this.videoWatchPlaylist.hasNextVideo()
+    }
+
+    return true
+  }
+
   private playNextVideoInAngularZone () {
     if (this.playlist) {
       this.zone.run(() => this.videoWatchPlaylist.navigateToNextPlaylistVideo())
@@ -559,6 +567,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
         autoplay: this.isAutoplay(),
         p2pEnabled: isP2PEnabled(video, this.serverConfig, loggedInOrAnonymousUser.p2pEnabled),
 
+        hasNextVideo: () => this.hasNextVideo(),
         nextVideo: () => this.playNextVideoInAngularZone(),
 
         playerElement: this.playerElement,
@@ -615,6 +624,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
 
     // Only set this if we're in a playlist
     if (this.playlist) {
+      options.common.hasPreviousVideo = () => this.videoWatchPlaylist.hasPreviousVideo()
+
       options.common.previousVideo = () => {
         this.zone.run(() => this.videoWatchPlaylist.navigateToPreviousPlaylistVideo())
       }