t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

throw more cancellationtokens around

Browse Source
This commit is contained in:
rootdarkarchon
2023-03-15 00:32:09 +01:00
parent 22e11cac6a
commit 3134b2c7a8
2 changed files with 54 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
MareSynchronos/Interop/IpcManager.cs
View File

@@ -607,18 +607,24 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
ActionQueue.Enqueue(action);
if (!fireAndForget)
try
{
var disposeToken = _disposalCts.Token;
var combinedToken = CancellationTokenSource.CreateLinkedTokenSource(disposeToken, token).Token;
if (!fireAndForget)
{
var disposeToken = _disposalCts.Token;
var combinedToken = CancellationTokenSource.CreateLinkedTokenSource(disposeToken, token).Token;
await Task.Delay(TimeSpan.FromSeconds(1)).ConfigureAwait(false);
if (!combinedToken.IsCancellationRequested)
await _dalamudUtil.WaitWhileCharacterIsDrawing(logger, obj, applicationId, 30000, combinedToken).ConfigureAwait(false);
await Task.Delay(TimeSpan.FromSeconds(1), combinedToken).ConfigureAwait(false);
if (!combinedToken.IsCancellationRequested)
await _dalamudUtil.WaitWhileCharacterIsDrawing(logger, obj, applicationId, 30000, combinedToken).ConfigureAwait(false);
}
}
finally
{
_penumbraRedrawRequests[obj.Address] = false;
}
Mediator.Publish(new PenumbraEndRedrawMessage(obj.Address));
}