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

allow load of devPlugins in non-default profile

Browse source
This commit is contained in:
goaaats 2024-01-19 23:32:39 +01:00
parent d26db7e053
commit 4e95d4fe37
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1506,6 +1506,16 @@ internal partial class PluginManager : IDisposable, IServiceType
{ {
// We don't know about this plugin, so we don't want to do anything here. // We don't know about this plugin, so we don't want to do anything here.
// The code below will take care of it and add it with the default value. // The code below will take care of it and add it with the default value.
Log.Verbose("DevPlugin {Name} not wanted in default plugin", plugin.Manifest.InternalName);
// If it is wanted by any other plugin, we do want to load it. This means we are looking it up twice, but I don't care right now.
// I am putting a TODO so that goat will clean it up some day soon.
if (await this.profileManager.GetWantStateAsync(
plugin.Manifest.WorkingPluginId,
plugin.Manifest.InternalName,
false,
false))
loadPlugin = true;
} }
else if (wantsInDefaultProfile == false && devPlugin.StartOnBoot) else if (wantsInDefaultProfile == false && devPlugin.StartOnBoot)
{ {
@ -1544,19 +1554,20 @@ internal partial class PluginManager : IDisposable, IServiceType
#pragma warning restore CS0618 #pragma warning restore CS0618
// Need to do this here, so plugins that don't load are still added to the default profile // Need to do this here, so plugins that don't load are still added to the default profile
var wantToLoad = await this.profileManager.GetWantStateAsync(plugin.Manifest.WorkingPluginId, plugin.Manifest.InternalName, defaultState); var wantedByAnyProfile = await this.profileManager.GetWantStateAsync(plugin.Manifest.WorkingPluginId, plugin.Manifest.InternalName, defaultState);
Log.Information("{Name} defaultState: {State} wantedByAnyProfile: {WantedByAny} loadPlugin: {LoadPlugin}", plugin.Manifest.InternalName, defaultState, wantedByAnyProfile, loadPlugin);
if (loadPlugin) if (loadPlugin)
{ {
try try
{ {
if (wantToLoad && !plugin.IsOrphaned) if (wantedByAnyProfile && !plugin.IsOrphaned)
{ {
await plugin.LoadAsync(reason); await plugin.LoadAsync(reason);
} }
else else
{ {
Log.Verbose($"{name} not loaded, wantToLoad:{wantToLoad} orphaned:{plugin.IsOrphaned}"); Log.Verbose($"{name} not loaded, wantToLoad:{wantedByAnyProfile} orphaned:{plugin.IsOrphaned}");
} }
} }
catch (InvalidPluginException) catch (InvalidPluginException)