Fix: Added null check for op before calling Unadvise (#17315)

seer-by-sentry[bot] · web-flow · commit 28ce3cf80b14 · 2025-07-25T10:30:08.000-04:00
diff --git a/src/Files.App/Utils/Shell/ShellFileOperations2.cs b/src/Files.App/Utils/Shell/ShellFileOperations2.cs
@@ -576,7 +576,7 @@ protected virtual void Dispose(bool disposing)
 				// Dispose managed state (managed objects).
 			}
 
-			if (sink != null)
+			if (sink != null && op != null)
 			{
 				op.Unadvise(sinkCookie);
 			}

Original file line number	Diff line number	Diff line change
`@@ -576,7 +576,7 @@ protected virtual void Dispose(bool disposing)`
`576`	`576`	`// Dispose managed state (managed objects).`
`577`	`577`	`}`
`578`	`578`
`579`		`- if (sink != null)`
	`579`	`+ if (sink != null && op != null)`
`580`	`580`	`{`
`581`	`581`	`op.Unadvise(sinkCookie);`
`582`	`582`	`}`