Merge pull request #176 from SKProCH/fixNotifyTrackEnded

Move firing player NotifyTrackEndedAsync after setting current item to null and updating status
angelobreuer · Aug 31, 2024 · 1ed9fd2 · 1ed9fd2
2 parents a046c26 + 5228bef
commit 1ed9fd2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Lavalink4NET/Players/LavalinkPlayer.cs b/src/Lavalink4NET/Players/LavalinkPlayer.cs
@@ -194,17 +194,17 @@ async ValueTask ILavalinkPlayerListener.NotifyTrackEndedAsync(LavalinkTrack trac
         };
 
         try
-        {
-            await NotifyTrackEndedAsync(previousItem, endReason, cancellationToken).ConfigureAwait(false);
-        }
-        finally
         {
             if (Volatile.Read(ref _trackVersion) == currentTrackVersion && endReason is not TrackEndReason.Replaced)
             {
                 CurrentItem = null;
                 await UpdateStateAsync(PlayerState.NotPlaying, cancellationToken).ConfigureAwait(false);
             }
         }
+        finally
+        {
+            await NotifyTrackEndedAsync(previousItem, endReason, cancellationToken).ConfigureAwait(false);
+        }
     }
 
     ValueTask ILavalinkPlayerListener.NotifyTrackExceptionAsync(LavalinkTrack track, TrackException exception, CancellationToken cancellationToken)