Merge branch 'jfversluis:main' into main

jfversluis · Sep 8, 2024 · 3dd8f8e · 3dd8f8e
2 parents fbcd288 + 2b53e19
commit 3dd8f8e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Plugin.Maui.Audio/AudioPlayer/AudioPlayer.android.cs b/src/Plugin.Maui.Audio/AudioPlayer/AudioPlayer.android.cs
@@ -306,8 +306,6 @@ void SetVolume(double volume, double balance)
 
 	void OnPlaybackEnded(object? sender, EventArgs e)
 	{
-		PlaybackEnded?.Invoke(this, e);
-
 		isPlaying = player.IsPlaying;
 
 		//this improves stability on older devices but has minor performance impact
@@ -318,6 +316,8 @@ void OnPlaybackEnded(object? sender, EventArgs e)
 			player.Stop();
 			player.Prepare();
 		}
+
+		PlaybackEnded?.Invoke(this, e);
 	}
 
 	protected virtual void Dispose(bool disposing)
@@ -330,6 +330,7 @@ protected virtual void Dispose(bool disposing)
 		if (disposing)
 		{
 			player.Completion -= OnPlaybackEnded;
+			player.Reset();
 			player.Release();
 			player.Dispose();
 			DeleteFile(cachePath);