Code Quality: Suppressed NullReferenceException caused by EnableRaisingEvents (#16157)

yaira2 · hishitetsu · web-flow · commit 194a9eee8412 · 2024-09-08T22:46:21.000-04:00
Co-authored-by: hishitetsu &lt;66369541+hishitetsu@users.noreply.github.com&gt;
diff --git a/src/Files.App/ViewModels/ShellViewModel.cs b/src/Files.App/ViewModels/ShellViewModel.cs
@@ -1943,7 +1943,11 @@ await Task.Factory.StartNew(() =>
 
 		private void WatchForWin32FolderChanges(string? folderPath)
 		{
-			if (Directory.Exists(folderPath))
+			if (!Directory.Exists(folderPath))
+				return;
+
+			// NOTE: Suppressed NullReferenceException caused by EnableRaisingEvents
+			SafetyExtensions.IgnoreExceptions(() =>
 			{
 				watcher = new FileSystemWatcher
 				{
@@ -1956,7 +1960,7 @@ private void WatchForWin32FolderChanges(string? folderPath)
 				watcher.Deleted += DirectoryWatcher_Changed;
 				watcher.Renamed += DirectoryWatcher_Changed;
 				watcher.EnableRaisingEvents = true;
-			}
+			}, App.Logger);
 		}
 
 		private async void DirectoryWatcher_Changed(object sender, FileSystemEventArgs e)

Original file line number	Diff line number	Diff line change
`@@ -1943,7 +1943,11 @@ await Task.Factory.StartNew(() =>`
`1943`	`1943`
`1944`	`1944`	`private void WatchForWin32FolderChanges(string? folderPath)`
`1945`	`1945`	`{`
`1946`		`- if (Directory.Exists(folderPath))`
	`1946`	`+ if (!Directory.Exists(folderPath))`
	`1947`	`+ return;`
	`1948`	`+`
	`1949`	`+ // NOTE: Suppressed NullReferenceException caused by EnableRaisingEvents`
	`1950`	`+ SafetyExtensions.IgnoreExceptions(() =>`
`1947`	`1951`	`{`
`1948`	`1952`	`watcher = new FileSystemWatcher`
`1949`	`1953`	`{`
`@@ -1956,7 +1960,7 @@ private void WatchForWin32FolderChanges(string? folderPath)`
`1956`	`1960`	`watcher.Deleted += DirectoryWatcher_Changed;`
`1957`	`1961`	`watcher.Renamed += DirectoryWatcher_Changed;`
`1958`	`1962`	`watcher.EnableRaisingEvents = true;`
`1959`		`- }`
	`1963`	`+ }, App.Logger);`
`1960`	`1964`	`}`
`1961`	`1965`
`1962`	`1966`	`private async void DirectoryWatcher_Changed(object sender, FileSystemEventArgs e)`