android/app/src/main/java/com/fabledsword/minstrel/player/output/OutputPickerController.kt

@@ -353,11 +353,13 @@ class OutputPickerController @Inject constructor(
         )
         var consecutiveFailures = 0
         var succeeded = 0
+        var aborted = false
         for ((i, ref) in tracks.withIndex()) {
+            if (aborted) break
             if (activeUpnpHolder.active.value?.routeId != route.id) {
                 Timber.w("UPnP extend: cancelled at offset %d (route changed)", i)
-                break
-            }
+                aborted = true
+            } else {
                 val outcome = runCatching {
                     val token = streamTokens.mint(ref.id)
                     transport.addURIToQueue(
@@ -382,7 +384,8 @@ class OutputPickerController @Inject constructor(
                             "UPnP extend: aborting after %d consecutive failures",
                             consecutiveFailures,
                         )
-                    break
+                        aborted = true
+                    }
                 }
             }
         }