ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-02 13:53:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix inconsistency

Browse source
This commit is contained in:
Soreepeong 2024-03-01 10:01:51 +09:00
parent 8fa8ca43b6
commit 111029e9bc
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Dalamud/Interface/Internal/TextureManager.cs
View file

@ -235,7 +235,7 @@ internal sealed class TextureManager : IServiceType, IDisposable, ITextureProvid
{ {
await using var ms = stream.CanSeek ? new MemoryStream((int)stream.Length) : new(); await using var ms = stream.CanSeek ? new MemoryStream((int)stream.Length) : new();
await stream.CopyToAsync(ms, ct).ConfigureAwait(false); await stream.CopyToAsync(ms, ct).ConfigureAwait(false);
return await this.CreateFromImageAsync(ms.GetBuffer(), ct); return this.NoThrottleCreateFromImage(ms.GetBuffer());
}, },
cancellationToken) cancellationToken)
.ContinueWith( .ContinueWith(
@ -249,6 +249,10 @@ internal sealed class TextureManager : IServiceType, IDisposable, ITextureProvid
.Unwrap(); .Unwrap();
/// <inheritdoc/> /// <inheritdoc/>
// NOTE: if this function is changed to be placed under the effect of the throttler, then look for the usages of
// this function, and for the usages that are used as a part of the delegate passed to LoadTextureAsync, change them
// to create texture in a non-throttling way; otherwise, recursive throttled texture load call will happen, and it
// may deadlock.
public IDalamudTextureWrap CreateFromRaw( public IDalamudTextureWrap CreateFromRaw(
RawImageSpecification specs, RawImageSpecification specs,
ReadOnlySpan<byte> bytes) ReadOnlySpan<byte> bytes)
@ -317,7 +321,7 @@ internal sealed class TextureManager : IServiceType, IDisposable, ITextureProvid
{ {
await using var ms = stream.CanSeek ? new MemoryStream((int)stream.Length) : new(); await using var ms = stream.CanSeek ? new MemoryStream((int)stream.Length) : new();
await stream.CopyToAsync(ms, ct).ConfigureAwait(false); await stream.CopyToAsync(ms, ct).ConfigureAwait(false);
return await this.CreateFromRawAsync(specs, ms.GetBuffer(), ct); return this.CreateFromRaw(specs, ms.GetBuffer().AsSpan(0, (int)ms.Length));
}, },
cancellationToken) cancellationToken)
.ContinueWith( .ContinueWith(