ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-30 12:23:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix wrong CancellationToken usage

Browse source
This commit is contained in:
Soreepeong 2025-12-22 18:46:29 +09:00
parent e2a18dee5e
commit 8ccfac2318
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -113,7 +113,7 @@ internal partial class StaThreadService : IInternalDisposableService
using var cts = CancellationTokenSource.CreateLinkedTokenSource( using var cts = CancellationTokenSource.CreateLinkedTokenSource(
this.cancellationTokenSource.Token, this.cancellationTokenSource.Token,
cancellationToken); cancellationToken);
await this.taskFactory.StartNew(action, cancellationToken).ConfigureAwait(true); await this.taskFactory.StartNew(action, cts.Token).ConfigureAwait(true);
} }
/// <summary>Runs a given delegate in the messaging thread.</summary> /// <summary>Runs a given delegate in the messaging thread.</summary>
@ -126,7 +126,7 @@ internal partial class StaThreadService : IInternalDisposableService
using var cts = CancellationTokenSource.CreateLinkedTokenSource( using var cts = CancellationTokenSource.CreateLinkedTokenSource(
this.cancellationTokenSource.Token, this.cancellationTokenSource.Token,
cancellationToken); cancellationToken);
return await this.taskFactory.StartNew(func, cancellationToken).ConfigureAwait(true); return await this.taskFactory.StartNew(func, cts.Token).ConfigureAwait(true);
} }
/// <summary>Runs a given delegate in the messaging thread.</summary> /// <summary>Runs a given delegate in the messaging thread.</summary>
@ -138,7 +138,7 @@ internal partial class StaThreadService : IInternalDisposableService
using var cts = CancellationTokenSource.CreateLinkedTokenSource( using var cts = CancellationTokenSource.CreateLinkedTokenSource(
this.cancellationTokenSource.Token, this.cancellationTokenSource.Token,
cancellationToken); cancellationToken);
await await this.taskFactory.StartNew(func, cancellationToken).ConfigureAwait(true); await await this.taskFactory.StartNew(func, cts.Token).ConfigureAwait(true);
} }
/// <summary>Runs a given delegate in the messaging thread.</summary> /// <summary>Runs a given delegate in the messaging thread.</summary>
@ -151,7 +151,7 @@ internal partial class StaThreadService : IInternalDisposableService
using var cts = CancellationTokenSource.CreateLinkedTokenSource( using var cts = CancellationTokenSource.CreateLinkedTokenSource(
this.cancellationTokenSource.Token, this.cancellationTokenSource.Token,
cancellationToken); cancellationToken);
return await await this.taskFactory.StartNew(func, cancellationToken).ConfigureAwait(true); return await await this.taskFactory.StartNew(func, cts.Token).ConfigureAwait(true);
} }
[LibraryImport("ole32.dll")] [LibraryImport("ole32.dll")]