From 3a61389b36e8aa54edd6c4f2716d9859173480f4 Mon Sep 17 00:00:00 2001
From: Holger Frovin Jensen <holger@frovin.com>
Date: Sun, 5 Dec 2021 22:51:06 +0100
Subject: [PATCH] Fixed autoplay removing list query.

---
 src/components/Player.vue     | 11 ++++++-----
 src/components/WatchVideo.vue |  2 --
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/components/Player.vue b/src/components/Player.vue
index 64680c49..581327ef 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -337,12 +337,11 @@ export default {
                         const params = this.$route.query;
                         let index = Number(params.index).valueOf();
                         const searchParams = new URLSearchParams();
-                        let isPlaylist = this.isPlaylist;
+                        let playlistEnded = index == this.playlist.videos;
                         let url =
-                            isPlaylist && index > this.playlist.relatedStreams.length
+                            this.isPlaylist && playlistEnded
                                 ? this.playlist.relatedStreams[index].url
                                 : this.video.relatedStreams[0].url;
-                        let playlistEnded = index == this.playlist.relatedStreams.length;
                         for (var param in params)
                             switch (param) {
                                 case "v":
@@ -350,12 +349,14 @@ export default {
                                     break;
                                 case "index":
                                     if (playlistEnded) {
-                                        searchParams.delete("index");
+                                        searchParams.delete(param);
                                     } else searchParams.set(param, index + 1);
                                     break;
                                 case "list":
                                     if (playlistEnded) {
-                                        searchParams.delete("list");
+                                        searchParams.delete(param);
+                                    } else {
+                                        searchParams.set(param, params[param]);
                                     }
                                     break;
                                 default:
diff --git a/src/components/WatchVideo.vue b/src/components/WatchVideo.vue
index 5d687f80..85285520 100644
--- a/src/components/WatchVideo.vue
+++ b/src/components/WatchVideo.vue
@@ -374,8 +374,6 @@ export default {
                                 case "index":
                                     searchParams.set(param, i + 1);
                                     break;
-                                case "list":
-                                    break;
                                 default:
                                     searchParams.set(param, params[param]);
                                     break;