maxmustermann/PowerToys
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[PTRun] Fix crash when shutting Windows down (#13401)

Browse source
This commit is contained in:
Jaime Bernardo 2021-09-23 18:09:38 +01:00 committed by GitHub
parent 64ecb553e4
commit d7098e87ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/modules/launcher/PowerLauncher/App.xaml.cs
View file

@ -40,6 +40,9 @@ namespace PowerLauncher
private StringMatcher _stringMatcher;
private SettingsReader _settingsReader;
// To prevent two disposals running at the same time.
private static readonly object _disposingLock = new object();
[STAThread]
public static void Main()
{
@ -238,33 +241,44 @@ namespace PowerLauncher
protected virtual void Dispose(bool disposing)
{
if (!_disposed)
// Prevent two disposes at the same time.
lock (_disposingLock)
{
Stopwatch.Normal("App.OnExit - Exit cost", () =>
if (!disposing)
{
Log.Info("Start PowerToys Run Exit---------------------------------------------------- ", GetType());
if (disposing)
{
if (_themeManager != null)
{
_themeManager.ThemeChanged -= OnThemeChanged;
}
return;
}
API?.SaveAppAllSettings();
PluginManager.Dispose();
_mainWindow?.Dispose();
API?.Dispose();
_mainVM?.Dispose();
_themeManager?.Dispose();
_disposed = true;
if (_disposed)
{
return;
}
_disposed = true;
}
Stopwatch.Normal("App.OnExit - Exit cost", () =>
{
Log.Info("Start PowerToys Run Exit---------------------------------------------------- ", GetType());
if (disposing)
{
if (_themeManager != null)
{
_themeManager.ThemeChanged -= OnThemeChanged;
}
// TODO: free unmanaged resources (unmanaged objects) and override finalizer
// TODO: set large fields to null
_disposed = true;
Log.Info("End PowerToys Run Exit ---------------------------------------------------- ", GetType());
});
}
API?.SaveAppAllSettings();
PluginManager.Dispose();
_mainWindow?.Dispose();
API?.Dispose();
_mainVM?.Dispose();
_themeManager?.Dispose();
}
// TODO: free unmanaged resources (unmanaged objects) and override finalizer
// TODO: set large fields to null
Log.Info("End PowerToys Run Exit ---------------------------------------------------- ", GetType());
});
}
// // TODO: override finalizer only if 'Dispose(bool disposing)' has code to free unmanaged resources