Avoid race condition

Author: 0x5bfa

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

@@ -31,6 +31,8 @@ public unsafe class JumpListManager : IDisposable
 		private FileSystemWatcher? _filesADLStoreFileWatcher;
 		private FileSystemWatcher? _filesCDLStoreFileWatcher;
 
+		private readonly Lock _updatJumpListLock = new();
+
 		public static event EventHandler? ExplorerJumpListChanged;
 		public static event EventHandler? FilesJumpListChanged;
 
@@ -399,7 +401,27 @@ public bool WatchJumpListChanges(string aumidCrcHash)
 			}
 			catch
 			{
-				// Gracefully exit if we can't monitor the file
+				if (_explorerADLStoreFileWatcher is not null)
+				{
+					_explorerADLStoreFileWatcher.EnableRaisingEvents = false;
+					_explorerADLStoreFileWatcher.Changed -= ExplorerJumpListWatcher_Changed;
+					_explorerADLStoreFileWatcher.Dispose();
+				}
+
+				if (_filesADLStoreFileWatcher is not null)
+				{
+					_filesADLStoreFileWatcher.EnableRaisingEvents = false;
+					_filesADLStoreFileWatcher.Changed -= FilesJumpListWatcher_Changed;
+					_filesADLStoreFileWatcher.Dispose();
+				}
+
+				if (_filesCDLStoreFileWatcher is not null)
+				{
+					_filesCDLStoreFileWatcher.EnableRaisingEvents = false;
+					_filesCDLStoreFileWatcher.Changed -= FilesJumpListWatcher_Changed;
+					_filesCDLStoreFileWatcher.Dispose();
+				}
+
 				return false;
 			}
 
@@ -490,31 +512,66 @@ private HRESULT GetFolderIconLocation(IShellItem* psi, PWSTR* pIconFilePath, uin
 
 		private void ExplorerJumpListWatcher_Changed(object sender, FileSystemEventArgs e)
 		{
-			PullJumpListFromExplorer();
+			STATask.Run(() =>
+			{
+				if (_updatJumpListLock.TryEnter()) // do not wait
+				{
+					try
+					{
+						Debug.WriteLine("in: ExplorerJumpListWatcher_Changed");
+						PullJumpListFromExplorer();
+						Debug.WriteLine("out: ExplorerJumpListWatcher_Changed");
+					}
+					finally
+					{
+						_updatJumpListLock.Exit();
+					}
+				}
+			},
+			null);
 		}
 
 		private void FilesJumpListWatcher_Changed(object sender, FileSystemEventArgs e)
 		{
-			PushJumpListToExplorer();
+			STATask.Run(() =>
+			{
+				if (_updatJumpListLock.TryEnter()) // do not wait
+				{
+					try
+					{
+						Debug.WriteLine("in: FilesJumpListWatcher_Changed");
+						PushJumpListToExplorer();
+						Debug.WriteLine("out: FilesJumpListWatcher_Changed");
+					}
+					finally
+					{
+						_updatJumpListLock.Exit();
+					}
+				}
+			},
+			null);
 		}
 
 		public void Dispose()
 		{
 			if (_explorerADLStoreFileWatcher is not null)
 			{
 				_explorerADLStoreFileWatcher.EnableRaisingEvents = false;
+				_explorerADLStoreFileWatcher.Changed -= ExplorerJumpListWatcher_Changed;
 				_explorerADLStoreFileWatcher.Dispose();
 			}
 
 			if (_filesADLStoreFileWatcher is not null)
 			{
 				_filesADLStoreFileWatcher.EnableRaisingEvents = false;
+				_filesADLStoreFileWatcher.Changed -= FilesJumpListWatcher_Changed;
 				_filesADLStoreFileWatcher.Dispose();
 			}
 
 			if (_filesCDLStoreFileWatcher is not null)
 			{
 				_filesCDLStoreFileWatcher.EnableRaisingEvents = false;
+				_filesCDLStoreFileWatcher.Changed -= FilesJumpListWatcher_Changed;
 				_filesCDLStoreFileWatcher.Dispose();
 			}
 		}

src/Files.App/Helpers/Application/AppLifecycleHelper.cs

@@ -12,10 +12,8 @@
 using Sentry;
 using Sentry.Protocol;
 using System.IO;
-using System.Runtime.InteropServices;
 using System.Text;
 using Windows.ApplicationModel;
-using Windows.Media.Playback;
 using Windows.Storage;
 using Windows.System;
 using Windows.Win32.Foundation;
@@ -169,7 +167,7 @@ await Task.WhenAll(
 				if (JumpListManager is not null)
 				{
 					HRESULT hr = JumpListManager.PullJumpListFromExplorer();
-					if (hr.Failed) App.Logger.LogWarning("Failed to synchronizing jump list unexpectedly.");
+					if (hr.Failed) App.Logger.LogWarning("Failed to synchronize jump list unexpectedly.");
 
 					bool result = JumpListManager.WatchJumpListChanges(AppUserModelIdCrcHash);
 					if (!result) App.Logger.LogWarning("Failed to watch jump list unexpectedly.");

src/Files.App/ViewModels/ShellViewModel.cs

@@ -228,7 +228,13 @@ public async Task SetWorkingDirectoryAsync(string? value)
 			if (value == "Home" || value == "ReleaseNotes" || value == "Settings")
 				currentStorageFolder = null;
 			else
-				AppLifecycleHelper.JumpListManager?.AddFolderToRecentCategory(value);
+			{
+				_ = STATask.Run(() =>
+				{
+					AppLifecycleHelper.JumpListManager?.AddFolderToRecentCategory(value);
+				},
+					App.Logger);
+			}
 
 			WorkingDirectory = value;