diff --git a/Dalamud/Game/Gui/ChatGui.cs b/Dalamud/Game/Gui/ChatGui.cs index 8c82ac36f..3cc6bb75c 100644 --- a/Dalamud/Game/Gui/ChatGui.cs +++ b/Dalamud/Game/Gui/ChatGui.cs @@ -391,8 +391,7 @@ namespace Dalamud.Game.Gui if (!FastByteArrayCompare(originalMessageData, message.RawData)) { allocatedString = Service.Get().NewString(message.RawData); - Log.Debug( - $"HandlePrintMessageDetour String modified: {originalMessageData}({messagePtr}) -> {message}({allocatedString.Address})"); + Log.Debug($"HandlePrintMessageDetour String modified: {originalMessageData}({messagePtr}) -> {message}({allocatedString.Address})"); messagePtr = allocatedString.Address; } diff --git a/Dalamud/Plugin/Internal/PluginRepository.cs b/Dalamud/Plugin/Internal/PluginRepository.cs index b21f61b51..e05c2dea6 100644 --- a/Dalamud/Plugin/Internal/PluginRepository.cs +++ b/Dalamud/Plugin/Internal/PluginRepository.cs @@ -30,8 +30,7 @@ namespace Dalamud.Plugin.Internal this.IsThirdParty = pluginMasterUrl != DalamudPluginsMasterUrl; this.IsEnabled = isEnabled; - // No need to wait for this - Task.Run(this.ReloadPluginMasterAsync); + this.ReloadPluginMasterAsync(); } /// @@ -73,12 +72,12 @@ namespace Dalamud.Plugin.Internal this.State = PluginRepositoryState.InProgress; this.PluginMaster = new List().AsReadOnly(); - return Task.Run(() => + return Task.Run(async () => { Log.Information($"Fetching repo: {this.PluginMasterUrl}"); using var client = new HttpClient(); - using var response = client.GetAsync(this.PluginMasterUrl).Result; - var data = response.Content.ReadAsStringAsync().Result; + using var response = await client.GetAsync(this.PluginMasterUrl); + var data = await response.Content.ReadAsStringAsync(); var pluginMaster = JsonConvert.DeserializeObject>(data); pluginMaster.Sort((pm1, pm2) => pm1.Name.CompareTo(pm2.Name));