C-2483 Fix queue overshot empty track player bug (#3353)

Co-authored-by: Nikki Kang <kangaroo233@gmail.com>
AudiusProject · May 17, 2023 · a456874 · a456874
1 parent 3d265f9
commit a456874
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/apps/audius-client/packages/common/src/store/queue/slice.ts b/apps/audius-client/packages/common/src/store/queue/slice.ts
@@ -144,11 +144,9 @@ const slice = createSlice({
           state.index = 0
           return
         }
-        if (!state.queueAutoplay) {
-          // Reset to last track
-          state.overshot = true
-          return
-        }
+        // Reset to last track
+        state.overshot = true
+        return
       }
 
       state.index = state.index + 1

diff --git a/apps/audius-client/packages/web/src/common/store/queue/sagas.ts b/apps/audius-client/packages/web/src/common/store/queue/sagas.ts
@@ -117,17 +117,12 @@ function* handleQueueAutoplay({
   const length = yield* select(getLength)
   const shuffle = yield* select(getShuffle)
   const repeatMode = yield* select(getRepeat)
-  const isCloseToEndOfQueue = index + 1 >= length
-  const isOnlySongInQueue = index === 0 && length === 1
+  const isCloseToEndOfQueue = index + 9 >= length
   const isNotRepeating =
     repeatMode === RepeatMode.OFF ||
     (repeatMode === RepeatMode.SINGLE && (skip || ignoreSkip))
 
-  if (
-    !shuffle &&
-    isNotRepeating &&
-    (isCloseToEndOfQueue || isOnlySongInQueue)
-  ) {
+  if (!shuffle && isNotRepeating && isCloseToEndOfQueue) {
     yield* waitForAccount()
     const userId = yield* select(getUserId)
     yield* put(