mirror of
https://github.com/goatcorp/Dalamud.git
synced 2025-12-15 05:04:15 +01:00
Fix ChatGui race condition (#1563)
This commit is contained in:
parent
a0f4baf8fa
commit
30c2872400
1 changed files with 36 additions and 7 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.Immutable;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
|
@ -40,6 +40,7 @@ internal sealed class ChatGui : IDisposable, IServiceType, IChatGui
|
||||||
private readonly LibcFunction libcFunction = Service<LibcFunction>.Get();
|
private readonly LibcFunction libcFunction = Service<LibcFunction>.Get();
|
||||||
|
|
||||||
private IntPtr baseAddress = IntPtr.Zero;
|
private IntPtr baseAddress = IntPtr.Zero;
|
||||||
|
private ImmutableDictionary<(string PluginName, uint CommandId), Action<uint, SeString>>? dalamudLinkHandlersCopy;
|
||||||
|
|
||||||
[ServiceManager.ServiceConstructor]
|
[ServiceManager.ServiceConstructor]
|
||||||
private ChatGui(TargetSigScanner sigScanner)
|
private ChatGui(TargetSigScanner sigScanner)
|
||||||
|
|
@ -84,7 +85,21 @@ internal sealed class ChatGui : IDisposable, IServiceType, IChatGui
|
||||||
public byte LastLinkedItemFlags { get; private set; }
|
public byte LastLinkedItemFlags { get; private set; }
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public IReadOnlyDictionary<(string PluginName, uint CommandId), Action<uint, SeString>> RegisteredLinkHandlers => this.dalamudLinkHandlers;
|
public IReadOnlyDictionary<(string PluginName, uint CommandId), Action<uint, SeString>> RegisteredLinkHandlers
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
var copy = this.dalamudLinkHandlersCopy;
|
||||||
|
if (copy is not null)
|
||||||
|
return copy;
|
||||||
|
|
||||||
|
lock (this.dalamudLinkHandlers)
|
||||||
|
{
|
||||||
|
return this.dalamudLinkHandlersCopy ??=
|
||||||
|
this.dalamudLinkHandlers.ToImmutableDictionary(x => x.Key, x => x.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Dispose of managed and unmanaged resources.
|
/// Dispose of managed and unmanaged resources.
|
||||||
|
|
@ -160,7 +175,12 @@ internal sealed class ChatGui : IDisposable, IServiceType, IChatGui
|
||||||
internal DalamudLinkPayload AddChatLinkHandler(string pluginName, uint commandId, Action<uint, SeString> commandAction)
|
internal DalamudLinkPayload AddChatLinkHandler(string pluginName, uint commandId, Action<uint, SeString> commandAction)
|
||||||
{
|
{
|
||||||
var payload = new DalamudLinkPayload { Plugin = pluginName, CommandId = commandId };
|
var payload = new DalamudLinkPayload { Plugin = pluginName, CommandId = commandId };
|
||||||
this.dalamudLinkHandlers.Add((pluginName, commandId), commandAction);
|
lock (this.dalamudLinkHandlers)
|
||||||
|
{
|
||||||
|
this.dalamudLinkHandlers.Add((pluginName, commandId), commandAction);
|
||||||
|
this.dalamudLinkHandlersCopy = null;
|
||||||
|
}
|
||||||
|
|
||||||
return payload;
|
return payload;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -170,9 +190,14 @@ internal sealed class ChatGui : IDisposable, IServiceType, IChatGui
|
||||||
/// <param name="pluginName">The name of the plugin handling the links.</param>
|
/// <param name="pluginName">The name of the plugin handling the links.</param>
|
||||||
internal void RemoveChatLinkHandler(string pluginName)
|
internal void RemoveChatLinkHandler(string pluginName)
|
||||||
{
|
{
|
||||||
foreach (var handler in this.dalamudLinkHandlers.Keys.ToList().Where(k => k.PluginName == pluginName))
|
lock (this.dalamudLinkHandlers)
|
||||||
{
|
{
|
||||||
this.dalamudLinkHandlers.Remove(handler);
|
var changed = false;
|
||||||
|
|
||||||
|
foreach (var handler in this.RegisteredLinkHandlers.Keys.Where(k => k.PluginName == pluginName))
|
||||||
|
changed |= this.dalamudLinkHandlers.Remove(handler);
|
||||||
|
if (changed)
|
||||||
|
this.dalamudLinkHandlersCopy = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -183,7 +208,11 @@ internal sealed class ChatGui : IDisposable, IServiceType, IChatGui
|
||||||
/// <param name="commandId">The ID of the command to be removed.</param>
|
/// <param name="commandId">The ID of the command to be removed.</param>
|
||||||
internal void RemoveChatLinkHandler(string pluginName, uint commandId)
|
internal void RemoveChatLinkHandler(string pluginName, uint commandId)
|
||||||
{
|
{
|
||||||
this.dalamudLinkHandlers.Remove((pluginName, commandId));
|
lock (this.dalamudLinkHandlers)
|
||||||
|
{
|
||||||
|
if (this.dalamudLinkHandlers.Remove((pluginName, commandId)))
|
||||||
|
this.dalamudLinkHandlersCopy = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void PrintTagged(string message, XivChatType channel, string? tag, ushort? color)
|
private void PrintTagged(string message, XivChatType channel, string? tag, ushort? color)
|
||||||
|
|
@ -391,7 +420,7 @@ internal sealed class ChatGui : IDisposable, IServiceType, IChatGui
|
||||||
var linkPayload = payloads[0];
|
var linkPayload = payloads[0];
|
||||||
if (linkPayload is DalamudLinkPayload link)
|
if (linkPayload is DalamudLinkPayload link)
|
||||||
{
|
{
|
||||||
if (this.dalamudLinkHandlers.TryGetValue((link.Plugin, link.CommandId), out var value))
|
if (this.RegisteredLinkHandlers.TryGetValue((link.Plugin, link.CommandId), out var value))
|
||||||
{
|
{
|
||||||
Log.Verbose($"Sending DalamudLink to {link.Plugin}: {link.CommandId}");
|
Log.Verbose($"Sending DalamudLink to {link.Plugin}: {link.CommandId}");
|
||||||
value.Invoke(link.CommandId, new SeString(payloads));
|
value.Invoke(link.CommandId, new SeString(payloads));
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue