Update

Author: 0x5bfa

src/Files.App.Storage/Storables/WindowsStorage/WindowsFolderWatcher.cs

@@ -51,7 +51,7 @@ public WindowsFolderWatcher(WindowsFolder folder)
 				WNDCLASSEXW wndClass = default;
 				wndClass.cbSize = (uint)sizeof(WNDCLASSEXW);
 				wndClass.lpfnWndProc = pfnWndProc;
-				wndClass.hInstance = PInvoke.GetModuleHandle(default(PWSTR)); ;
+				wndClass.hInstance = PInvoke.GetModuleHandle(default(PWSTR));
 				wndClass.lpszClassName = pszClassName;
 
 				PInvoke.RegisterClassEx(&wndClass);
@@ -103,10 +103,7 @@ private unsafe LRESULT WndProc(HWND hWnd, uint uMessage, WPARAM wParam, LPARAM l
 					break;
 				case PInvoke.WM_DESTROY:
 					{
-						PInvoke.SHChangeNotifyDeregister(_registrationID);
-						PInvoke.CoTaskMemFree(_pidl);
-						PInvoke.CoUninitialize();
-						PInvoke.PostQuitMessage(0);
+						Dispose();
 					}
 					break;
 			}
@@ -116,10 +113,16 @@ private unsafe LRESULT WndProc(HWND hWnd, uint uMessage, WPARAM wParam, LPARAM l
 
 		public void Dispose()
 		{
+			PInvoke.SHChangeNotifyDeregister(_registrationID);
+			PInvoke.CoTaskMemFree(_pidl);
+			PInvoke.CoUninitialize();
+			PInvoke.PostQuitMessage(0);
 		}
 
 		public ValueTask DisposeAsync()
 		{
+			Dispose();
+
 			return ValueTask.CompletedTask;
 		}
 	}