improve duplicate check by tracking all static media IDs right away

openbroadcaster · Jan 25, 2025 · 8c706e1 · 8c706e1
1 parent e6784dd
commit 8c706e1
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/models/playlists_model.php b/models/playlists_model.php
@@ -722,6 +722,13 @@ public function resolve($playlist_id, $player_id, $parent_player_id = false, $st
         $used_ids = [];
         $used_ids_stationid = [];
 
+        // add our static media items to our used IDs right away
+        foreach ($playlist_items as $playlist_item) {
+            if ($playlist_item['item_type'] == 'media') {
+                $used_ids[] = $playlist_item['item_id'];
+            }
+        }
+
         // track items to return
         $return = [];
 
@@ -772,7 +779,6 @@ public function resolve($playlist_id, $player_id, $parent_player_id = false, $st
                         }
                     }
                     $media_items_tmp[] = $tmp;
-                    $used_ids[] = $tmp['id'];
                 }
             } elseif ($playlist_item['item_type'] == 'dynamic') {
                 // dynamic item