diff --git a/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj b/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj index f1ce7bac9..3b7556af7 100644 --- a/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj +++ b/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj @@ -3,7 +3,7 @@ Dalamud.CorePlugin net5.0-windows x64 - 9.0 + 10.0 true false false diff --git a/Dalamud.Injector/Dalamud.Injector.csproj b/Dalamud.Injector/Dalamud.Injector.csproj index d9ce042a6..dbe4c94da 100644 --- a/Dalamud.Injector/Dalamud.Injector.csproj +++ b/Dalamud.Injector/Dalamud.Injector.csproj @@ -5,7 +5,7 @@ win-x64 x64 x64;AnyCPU - 9.0 + 10.0 diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj index 89bd72417..93fe54d24 100644 --- a/Dalamud/Dalamud.csproj +++ b/Dalamud/Dalamud.csproj @@ -4,7 +4,7 @@ net5.0-windows x64 x64;AnyCPU - 9.0 + 10.0 diff --git a/Dalamud/Interface/Internal/Windows/PluginImageCache.cs b/Dalamud/Interface/Internal/Windows/PluginImageCache.cs index d61ba8638..684ffc439 100644 --- a/Dalamud/Interface/Internal/Windows/PluginImageCache.cs +++ b/Dalamud/Interface/Internal/Windows/PluginImageCache.cs @@ -7,6 +7,7 @@ using System.Net; using System.Net.Http; using System.Threading; using System.Threading.Tasks; + using Dalamud.Game; using Dalamud.Plugin.Internal; using Dalamud.Plugin.Internal.Types; @@ -80,21 +81,6 @@ namespace Dalamud.Interface.Internal.Windows framework.Update += this.FrameworkOnUpdate; } - private void FrameworkOnUpdate(Framework framework) - { - try - { - if (!this.loadQueue.TryTake(out var loadAction, 0, this.downloadToken.Token)) - return; - - loadAction.Invoke(); - } - catch (Exception ex) - { - Log.Error(ex, "An unhandled exception occurred in image loader framework dispatcher"); - } - } - /// /// Gets the default plugin icon. /// @@ -231,6 +217,21 @@ namespace Dalamud.Interface.Internal.Windows return false; } + private void FrameworkOnUpdate(Framework framework) + { + try + { + if (!this.loadQueue.TryTake(out var loadAction, 0, this.downloadToken.Token)) + return; + + loadAction.Invoke(); + } + catch (Exception ex) + { + Log.Error(ex, "An unhandled exception occurred in image loader framework dispatcher"); + } + } + private async void DownloadTask() { while (!this.downloadToken.Token.IsCancellationRequested) @@ -482,12 +483,9 @@ namespace Dalamud.Interface.Internal.Windows var bytes = await data.Content.ReadAsByteArrayAsync(); imageBytes[i] = bytes; - - Log.Verbose($"Plugin image{i + 1} for {manifest.InternalName} downloaded"); didAny = true; - } if (didAny)