Skip to content

Commit 799f739

Browse files
[AdvancedPaste]Fix NullReferenceException on Dispose (#36428)
[AdvancedPaste] Fixed NullReferenceException on Dispose
1 parent e77ea96 commit 799f739

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ protected virtual void Dispose(bool disposing)
263263
if (disposing)
264264
{
265265
EtwTrace?.Dispose();
266-
window.Dispose();
266+
window?.Dispose();
267267
}
268268

269269
disposedValue = true;

src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ private void Dispose(bool disposing)
154154
{
155155
if (disposing)
156156
{
157-
_cancellationTokenSource.Dispose();
158-
_watcher.Dispose();
157+
_cancellationTokenSource?.Dispose();
158+
_watcher?.Dispose();
159159
}
160160

161161
_disposedValue = true;

0 commit comments

Comments
 (0)