From 6bd1edb3437fb0bde7330ebc45be443ef56717f0 Mon Sep 17 00:00:00 2001
From: hishitetsu <66369541+hishitetsu@users.noreply.github.com>
Date: Thu, 31 Jul 2025 15:37:44 +0900
Subject: [PATCH] Update LibraryManager.cs

---
 src/Files.App/Utils/Library/LibraryManager.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Files.App/Utils/Library/LibraryManager.cs b/src/Files.App/Utils/Library/LibraryManager.cs
index a3520eb6122b..937ed51096e4 100644
--- a/src/Files.App/Utils/Library/LibraryManager.cs
+++ b/src/Files.App/Utils/Library/LibraryManager.cs
@@ -382,7 +382,12 @@ private void OnLibraryChanged(WatcherChangeTypes changeType, string oldPath, str
 					return;
 				}
 
-				var library1 = ShellFolderExtensions.GetShellLibraryItem(library, newPath);
+				var library1 = SafetyExtensions.IgnoreExceptions(() => ShellFolderExtensions.GetShellLibraryItem(library, newPath));
+				if (library1 is null)
+				{
+					App.Logger.LogWarning($"Failed to open library after {changeType}: {newPath}");
+					return;
+				}
 
 				string? path = oldPath;
 				if (string.IsNullOrEmpty(oldPath))