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

fix crashing and such

Browse Source
This commit is contained in:
rootdarkarchon
2023-02-27 12:05:53 +01:00
parent 912d0bd800
commit a37281b719
4 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
MareSynchronos/Managers/CachedPlayer.cs
View File

@@ -390,7 +390,7 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
}
}
while (!_applicationTask?.IsCompleted ?? false)
while (!_applicationTask?.IsCompleted ?? false && !downloadToken.IsCancellationRequested)
{
// block until current application is done
_logger.LogDebug("Waiting for current data application (Id: {id}) to finish", _applicationId);
@@ -416,15 +416,12 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
_logger.LogDebug("[{applicationId}] Application finished", _applicationId);
});
}, downloadToken).ContinueWith(task =>
{
_downloadCancellationTokenSource = null;
_downloadCancellationTokenSource = null;
if (!task.IsCanceled) return;
_logger.LogDebug("Download was cancelled");
_apiController.CancelDownload(downloadId);
_logger.LogDebug("Download was cancelled");
_apiController.CancelDownload(downloadId);
});
}, downloadToken);
}
private Task? _applicationTask;