ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not try to dispose undisposable plugins (#949)

Browse source
This commit is contained in:
Aireil 2022-08-04 22:54:09 +02:00 • committed by GitHub
parent e9952cd99b
commit 63e4490194
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Dalamud/Plugin/Internal/PluginManager.cs
View file

@ -265,10 +265,12 @@ internal partial class PluginManager : IDisposable, IServiceType
/// <inheritdoc/> /// <inheritdoc/>
public void Dispose() public void Dispose()
{ {
if (this.InstalledPlugins.Any()) var disposablePlugins =
this.InstalledPlugins.Where(plugin => plugin.State is PluginState.Loaded or PluginState.LoadError).ToArray();
if (disposablePlugins.Any())
{ {
// Unload them first, just in case some of plugin codes are still running via callbacks initiated externally. // Unload them first, just in case some of plugin codes are still running via callbacks initiated externally.
foreach (var plugin in this.InstalledPlugins.Where(plugin => !plugin.Manifest.CanUnloadAsync)) foreach (var plugin in disposablePlugins.Where(plugin => !plugin.Manifest.CanUnloadAsync))
{ {
try try
{ {
@ -280,7 +282,7 @@ internal partial class PluginManager : IDisposable, IServiceType
} }
} }
Task.WaitAll(this.InstalledPlugins Task.WaitAll(disposablePlugins
.Where(plugin => plugin.Manifest.CanUnloadAsync) .Where(plugin => plugin.Manifest.CanUnloadAsync)
.Select(plugin => Task.Run(async () => .Select(plugin => Task.Run(async () =>
{ {
@ -300,7 +302,7 @@ internal partial class PluginManager : IDisposable, IServiceType
// Now that we've waited enough, dispose the whole plugin. // Now that we've waited enough, dispose the whole plugin.
// Since plugins should have been unloaded above, this should be done quickly. // Since plugins should have been unloaded above, this should be done quickly.
foreach (var plugin in this.InstalledPlugins) foreach (var plugin in disposablePlugins)
plugin.ExplicitDisposeIgnoreExceptions($"Error disposing {plugin.Name}", Log); plugin.ExplicitDisposeIgnoreExceptions($"Error disposing {plugin.Name}", Log);
} }