From c4372d0c895bfd8335d4e221e425883d8b23104a Mon Sep 17 00:00:00 2001
From: fire-light43 <282604282+fire-light43@users.noreply.github.com>
Date: Mon, 11 May 2026 12:59:43 +0000
Subject: [PATCH] Fix rare bug in the download queue

---
 .../cloudstream3/services/DownloadQueueService.kt     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/services/DownloadQueueService.kt b/app/src/main/java/com/lagradost/cloudstream3/services/DownloadQueueService.kt
index 028356e76cc..e07747a860c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/services/DownloadQueueService.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/services/DownloadQueueService.kt
@@ -36,6 +36,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.flow.updateAndGet
@@ -186,6 +187,16 @@ class DownloadQueueService : Service() {
             debugAssert({ timeTaken == null }, { "Downloader startup should not time out" })
 
             totalDownloadFlow
+                .debounce { (instances, queue) ->
+                    // Filter away incorrect transient queue states.
+                    // For example when we pop the queue and add a download instance there exists a transient state where
+                    // there is no queue and no download instances (leading to an early exit)
+                    if (instances.isEmpty() && queue.isEmpty()) {
+                        500.milliseconds
+                    } else {
+                        0.milliseconds
+                    }
+                }
                 .takeWhile { (instances, queue) ->
                     // Stop if destroyed
                     isRunning