aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShadowghost <Shadowghost@users.noreply.github.com>2024-06-23 11:40:46 -0400
committerJoshua M. Boniface <joshua@boniface.me>2024-06-23 11:40:46 -0400
commit529d24ec308645e92839b216fd0b52acd4ad62a2 (patch)
tree9523082a345c4e0e4674e56daa44ecea10dbe999
parentb0f2135762c2249f58244568d0202be343f7a8dc (diff)
Backport pull request #12037 from jellyfin/release-10.9.z
Do not fail user deletion if we have no playlist folder Original-merge: d90f504ca79765a9dae86484c136f125281d661d Merged-by: Bond-009 <bond.009@outlook.com> Backported-by: Joshua M. Boniface <joshua@boniface.me>
-rw-r--r--Emby.Server.Implementations/Playlists/PlaylistManager.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Playlists/PlaylistManager.cs b/Emby.Server.Implementations/Playlists/PlaylistManager.cs
index 0fd9175dc..47ff22c0b 100644
--- a/Emby.Server.Implementations/Playlists/PlaylistManager.cs
+++ b/Emby.Server.Implementations/Playlists/PlaylistManager.cs
@@ -170,8 +170,13 @@ namespace Emby.Server.Implementations.Playlists
private List<Playlist> GetUserPlaylists(Guid userId)
{
var user = _userManager.GetUserById(userId);
+ var playlistsFolder = GetPlaylistsFolder(userId);
+ if (playlistsFolder is null)
+ {
+ return [];
+ }
- return GetPlaylistsFolder(userId).GetChildren(user, true).OfType<Playlist>().ToList();
+ return playlistsFolder.GetChildren(user, true).OfType<Playlist>().ToList();
}
private static string GetTargetPath(string path)