Update

Author: 0x5bfa

src/Files.App.Storage/Windows/Managers/JumpListManager.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using System;
+using System.IO;
 using System.Runtime.InteropServices;
 using Windows.ApplicationModel;
 using Windows.Win32;
@@ -26,6 +26,8 @@ public unsafe class JumpListManager : IDisposable
 
 		private readonly static string _aumid = $"{Package.Current.Id.FamilyName}!App";
 
+		private FileSystemWatcher? _watcher;
+
 		public bool SyncWithExplorerJumpList(int maxCount = 30)
 		{
 			ClearAutomaticDestinations();
@@ -47,12 +49,36 @@ public bool SyncWithExplorerJumpList(int maxCount = 30)
 			return true;
 		}
 
-		public void WatchExplorerJumpListChanges()
+		public bool WatchExplorerJumpListChanges()
 		{
 			// Get the path to the Explorer's automatic destinations file
 			using ComHeapPtr<char> pwszRecentFolderPath = default;
 			PInvoke.SHGetKnownFolderPath(FOLDERID.FOLDERID_Recent, KNOWN_FOLDER_FLAG.KF_FLAG_DONT_VERIFY | KNOWN_FOLDER_FLAG.KF_FLAG_NO_ALIAS, HANDLE.Null, (PWSTR*)pwszRecentFolderPath.GetAddressOf());
 			var path = $"{new(pwszRecentFolderPath.Get())}\\AutomaticDestinations";
+
+			// NOTE: Since SHChangeNotifyRegister doesn't notify us of the changes made to the contents of a file, we stick to ReadDirectoryChange for this scenario
+			_watcher?.Dispose();
+			_watcher = new()
+			{
+				Path = path,
+				Filter = "f01b4d95cf55d32a.automaticDestinations-ms", // Explorer's automatic destinations file
+				NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.FileName | NotifyFilters.CreationTime,
+			};
+
+			_watcher.Changed += Watcher_Changed;
+
+			try
+			{
+				// This may throw various exceptions (e.g., when the file doesn't exist or cannot be accessed)
+				_watcher.EnableRaisingEvents = true;
+			}
+			catch
+			{
+				// Gracefully exit if we can't monitor the file
+				return false;
+			}
+
+			return true;
 		}
 
 		private bool ClearAutomaticDestinations()
@@ -235,14 +261,19 @@ private bool CopyToFilesAutomaticDestinations(IObjectCollection* pRecentOC, IObj
 			return true;
 		}
 
-		private void Watcher_FileChanged()
+		private void Watcher_Changed(object sender, FileSystemEventArgs e)
 		{
 			// Sync the jump list when the Explorer's automatic destinations file changes
 			SyncWithExplorerJumpList();
 		}
 
 		public void Dispose()
 		{
+			if (_watcher is not null)
+			{
+				_watcher.EnableRaisingEvents = false;
+				_watcher.Dispose();
+			}
 		}
 	}
 }