From 529d24ec308645e92839b216fd0b52acd4ad62a2 Mon Sep 17 00:00:00 2001 From: Shadowghost Date: Sun, 23 Jun 2024 11:40:46 -0400 Subject: [PATCH] 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 Backported-by: Joshua M. Boniface --- Emby.Server.Implementations/Playlists/PlaylistManager.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Emby.Server.Implementations/Playlists/PlaylistManager.cs b/Emby.Server.Implementations/Playlists/PlaylistManager.cs index 0fd9175dcc..47ff22c0b3 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 GetUserPlaylists(Guid userId) { var user = _userManager.GetUserById(userId); + var playlistsFolder = GetPlaylistsFolder(userId); + if (playlistsFolder is null) + { + return []; + } - return GetPlaylistsFolder(userId).GetChildren(user, true).OfType().ToList(); + return playlistsFolder.GetChildren(user, true).OfType().ToList(); } private static string GetTargetPath(string path)