From 42b3e111f844f6de6a145de2760ccfd7e97e623b Mon Sep 17 00:00:00 2001
From: Kingkor Roy Tirtho <krtirtho@gmail.com>
Date: Tue, 7 Mar 2023 11:10:16 +0600
Subject: [PATCH] fix(playlist_queue): load method not preserving the active
 track before filtering blacklisted tracks

---
 lib/provider/playlist_queue_provider.dart | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/provider/playlist_queue_provider.dart b/lib/provider/playlist_queue_provider.dart
index 1a8713464..017d5aee4 100644
--- a/lib/provider/playlist_queue_provider.dart
+++ b/lib/provider/playlist_queue_provider.dart
@@ -412,10 +412,14 @@ class PlaylistQueueNotifier extends PersistedStateNotifier<PlaylistQueue?> {
   }
 
   void load(Iterable<Track> tracks, {int active = 0}) {
+    final activeTrack = tracks.elementAt(active);
+    final filtered = Set.from(blacklist.filter(tracks));
     state = PlaylistQueue(
       Set.from(blacklist.filter(tracks)),
       tempTracks: {},
-      active: active,
+      active: filtered
+          .toList()
+          .indexWhere((element) => element.id == activeTrack.id),
     );
   }