Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 03:37:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Run-Plugin][Program] Fix null reference exception on Dispose (#11785)

Browse Source
This commit is contained in:
Mykhailo Pylyp
2021-06-18 13:40:10 +03:00
committed by GitHub
parent c953f10c21
commit f662c062d2
7 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Main.cs
View File

@@ -170,8 +170,12 @@ namespace Community.PowerToys.Run.Plugin.UnitConverter
if (!_disposed) if (!_disposed)
{ {
if (disposing) if (disposing)
{
if (_context != null && _context.API != null)
{ {
_context.API.ThemeChanged -= OnThemeChanged; _context.API.ThemeChanged -= OnThemeChanged;
}
_disposed = true; _disposed = true;
} }
} }

4
src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Main.cs
View File

@@ -133,8 +133,12 @@ namespace Microsoft.Plugin.Folder
if (!_disposed) if (!_disposed)
{ {
if (disposing) if (disposing)
{
if (_context != null && _context.API != null)
{ {
_context.API.ThemeChanged -= OnThemeChanged; _context.API.ThemeChanged -= OnThemeChanged;
}
_disposed = true; _disposed = true;
} }
} }

6
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Main.cs
View File

@@ -209,9 +209,13 @@ namespace Microsoft.Plugin.Program
if (!_disposed) if (!_disposed)
{ {
if (disposing) if (disposing)
{
if (_context != null && _context.API != null)
{ {
_context.API.ThemeChanged -= OnThemeChanged; _context.API.ThemeChanged -= OnThemeChanged;
_win32ProgramRepositoryHelper.Dispose(); }
_win32ProgramRepositoryHelper?.Dispose();
_disposed = true; _disposed = true;
} }
} }

4
src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Main.cs
View File

@@ -225,8 +225,12 @@ namespace Microsoft.Plugin.Uri
protected virtual void Dispose(bool disposing) protected virtual void Dispose(bool disposing)
{ {
if (!_disposed && disposing) if (!_disposed && disposing)
{
if (Context != null && Context.API != null)
{ {
Context.API.ThemeChanged -= OnThemeChanged; Context.API.ThemeChanged -= OnThemeChanged;
}
_disposed = true; _disposed = true;
} }
} }

4
src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Main.cs
View File

@@ -112,8 +112,12 @@ namespace Microsoft.PowerToys.Run.Plugin.Calculator
if (!_disposed) if (!_disposed)
{ {
if (disposing) if (disposing)
{
if (Context != null && Context.API != null)
{ {
Context.API.ThemeChanged -= OnThemeChanged; Context.API.ThemeChanged -= OnThemeChanged;
}
_disposed = true; _disposed = true;
} }
} }

2
src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Main.cs
View File

@@ -154,7 +154,7 @@ namespace Microsoft.PowerToys.Run.Plugin.Registry
return; return;
} }
if (!(_context is null)) if (_context != null && _context.API != null)
{ {
_context.API.ThemeChanged -= OnThemeChanged; _context.API.ThemeChanged -= OnThemeChanged;
} }

2
src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Main.cs
View File

@@ -169,7 +169,7 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings
return; return;
} }
if (!(_context is null)) if (_context != null && _context.API != null)
{ {
_context.API.ThemeChanged -= OnThemeChanged; _context.API.ThemeChanged -= OnThemeChanged;
} }