From 8ccfac231830104492d5b53d71c08d36e693f16c Mon Sep 17 00:00:00 2001
From: Soreepeong <3614868+Soreepeong@users.noreply.github.com>
Date: Mon, 22 Dec 2025 18:46:29 +0900
Subject: [PATCH] Fix wrong CancellationToken usage

---
 Dalamud/Interface/Internal/StaThreadService.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dalamud/Interface/Internal/StaThreadService.cs b/Dalamud/Interface/Internal/StaThreadService.cs
index bb5caa281..5e93bbf75 100644
--- a/Dalamud/Interface/Internal/StaThreadService.cs
+++ b/Dalamud/Interface/Internal/StaThreadService.cs
@@ -113,7 +113,7 @@ internal partial class StaThreadService : IInternalDisposableService
         using var cts = CancellationTokenSource.CreateLinkedTokenSource(
             this.cancellationTokenSource.Token,
             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>
@@ -126,7 +126,7 @@ internal partial class StaThreadService : IInternalDisposableService
         using var cts = CancellationTokenSource.CreateLinkedTokenSource(
             this.cancellationTokenSource.Token,
             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>
@@ -138,7 +138,7 @@ internal partial class StaThreadService : IInternalDisposableService
         using var cts = CancellationTokenSource.CreateLinkedTokenSource(
             this.cancellationTokenSource.Token,
             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>
@@ -151,7 +151,7 @@ internal partial class StaThreadService : IInternalDisposableService
         using var cts = CancellationTokenSource.CreateLinkedTokenSource(
             this.cancellationTokenSource.Token,
             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")]