Fix stucked HLS player

[github/Chocobozzz/PeerTube.git] / server / lib / live / live-manager.ts

diff --git a/server/lib/live/live-manager.ts b/server/lib/live/live-manager.ts
index 74f2030910574798ddb6c92e84bac2744333e092..649ad5195eb3d27a1b75b4e1b87ab9cd8c992048 100644 (file)
--- a/server/lib/live/live-manager.ts
+++ b/server/lib/live/live-manager.ts
@@ -395,7 +395,7 @@ class LiveManager {
 
       const live = await VideoLiveModel.loadByVideoId(fullVideo.id)
 
-      const liveSession = liveSessionArg ?? await VideoLiveSessionModel.findCurrentSessionOf(fullVideo.id)
+      const liveSession = liveSessionArg ?? await VideoLiveSessionModel.findLatestSessionOf(fullVideo.id)
 
       // On server restart during a live
       if (!liveSession.endDate) {
@@ -483,6 +483,8 @@ class LiveManager {
 
   private async saveEndingSession (videoId: number, error: LiveVideoError | null) {
     const liveSession = await VideoLiveSessionModel.findCurrentSessionOf(videoId)
+    if (!liveSession) return
+
     liveSession.endDate = new Date()
     liveSession.error = error