Merge pull request libre-tube#7429 from FineFindus/fix/clear-stream

FineFindus · web-flow · commit e8673f4cb9b4 · 2025-05-20T22:23:46.000+02:00
fix(player): clear current stream when closing player
diff --git a/app/src/main/java/com/github/libretube/services/AbstractPlayerService.kt b/app/src/main/java/com/github/libretube/services/AbstractPlayerService.kt
@@ -409,6 +409,8 @@ abstract class AbstractPlayerService : MediaLibraryService(), MediaLibrarySessio
                 mediaLibrarySession = null
             }
 
+            PlayingQueue.clear()
+
             ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
             stopSelf()
 
diff --git a/app/src/main/java/com/github/libretube/util/PlayingQueue.kt b/app/src/main/java/com/github/libretube/util/PlayingQueue.kt
@@ -37,6 +37,7 @@ object PlayingQueue {
         }
         queueJobs.clear()
         queue.clear()
+        currentStream = null
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -409,6 +409,8 @@ abstract class AbstractPlayerService : MediaLibraryService(), MediaLibrarySessio`
`409`	`409`	`mediaLibrarySession = null`
`410`	`410`	`}`
`411`	`411`
	`412`	`+ PlayingQueue.clear()`
	`413`	`+`
`412`	`414`	`ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)`
`413`	`415`	`stopSelf()`
`414`	`416`