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

formatting

Browse source
This commit is contained in:
Raymond 2021-09-12 21:05:42 -04:00
parent dd92824361
commit 9db492d26d
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Dalamud/Interface/Windowing/Window.cs
View file

@ -1,4 +1,5 @@
using System.Numerics; using System.Numerics;
using Dalamud.Configuration.Internal; using Dalamud.Configuration.Internal;
using Dalamud.Game.ClientState.Keys; using Dalamud.Game.ClientState.Keys;
using ImGuiNET; using ImGuiNET;

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

@ -171,8 +171,11 @@ namespace Dalamud.Plugin.Internal
/// <summary> /// <summary>
/// Load all plugins, sorted by priority. Any plugins with no explicit definition file or a negative priority /// Load all plugins, sorted by priority. Any plugins with no explicit definition file or a negative priority
/// are loaded asynchronously. Should only be called during Dalamud startup. /// are loaded asynchronously.
/// </summary> /// </summary>
/// <remarks>
/// This should only be called during Dalamud startup.
/// </remarks>
public void LoadAllPlugins() public void LoadAllPlugins()
{ {
if (this.SafeMode) if (this.SafeMode)
@ -267,8 +270,11 @@ namespace Dalamud.Plugin.Internal
var asyncPlugins = pluginDefs.Where(def => def.Manifest == null || def.Manifest.LoadPriority <= 0); var asyncPlugins = pluginDefs.Where(def => def.Manifest == null || def.Manifest.LoadPriority <= 0);
Task.Run(() => LoadPlugins(asyncPlugins)) Task.Run(() => LoadPlugins(asyncPlugins))
.ContinueWith(task => this.PluginsReady = true) .ContinueWith(task =>
.ContinueWith(task => this.NotifyInstalledPluginsChanged()); {
this.PluginsReady = true;
this.NotifyInstalledPluginsChanged();
});
} }
/// <summary> /// <summary>
@ -727,24 +733,22 @@ namespace Dalamud.Plugin.Internal
var plugin = metadata.InstalledPlugin; var plugin = metadata.InstalledPlugin;
// Can't update that! // Can't update that!
if (plugin is LocalDevPlugin) if (plugin.IsDev)
return null; return null;
var updateStatus = new PluginUpdateStatus var updateStatus = new PluginUpdateStatus
{ {
InternalName = plugin.Manifest.InternalName, InternalName = plugin.Manifest.InternalName,
Name = plugin.Manifest.Name, Name = plugin.Manifest.Name,
Version = metadata.UseTesting ? metadata.UpdateManifest.TestingAssemblyVersion : metadata.UpdateManifest.AssemblyVersion, Version = metadata.UseTesting
? metadata.UpdateManifest.TestingAssemblyVersion
: metadata.UpdateManifest.AssemblyVersion,
}; };
if (dryRun) updateStatus.WasUpdated = true;
{
updateStatus.WasUpdated = true;
}
else
{
updateStatus.WasUpdated = true;
if (!dryRun)
{
// Unload if loaded // Unload if loaded
if (plugin.State == PluginState.Loaded || plugin.State == PluginState.LoadError) if (plugin.State == PluginState.Loaded || plugin.State == PluginState.LoadError)
{ {