friendlynamazu/client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix cts

Browse Source
This commit is contained in:
Stanley Dimant
2024-11-22 12:40:10 +01:00
parent 3f08bb024d
commit d3255ca047
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MareSynchronos/UI/SettingsUi.cs
View File

@@ -120,8 +120,6 @@ public class SettingsUi : WindowMediatorSubscriberBase
public override void OnOpen() public override void OnOpen()
{ {
_uiShared.RestOAuthTasksState(); _uiShared.RestOAuthTasksState();
_speedTestCts?.Cancel();
_speedTestCts?.Dispose();
_speedTestCts = new(); _speedTestCts = new();
} }
@@ -134,6 +132,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
_speedTestTask = null; _speedTestTask = null;
_speedTestCts?.Cancel(); _speedTestCts?.Cancel();
_speedTestCts?.Dispose(); _speedTestCts?.Dispose();
_speedTestCts = null;
base.OnClose(); base.OnClose();
} }
@@ -364,7 +363,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
{ {
if (_uiShared.IconTextButton(FontAwesomeIcon.ArrowRight, "Start Speedtest")) if (_uiShared.IconTextButton(FontAwesomeIcon.ArrowRight, "Start Speedtest"))
{ {
_speedTestTask = RunSpeedTest(_downloadServersTask.Result!, _speedTestCts.Token); _speedTestTask = RunSpeedTest(_downloadServersTask.Result!, _speedTestCts?.Token ?? CancellationToken.None);
} }
} }
else if (!_speedTestTask.IsCompleted) else if (!_speedTestTask.IsCompleted)
@@ -373,8 +372,8 @@ public class SettingsUi : WindowMediatorSubscriberBase
UiSharedService.ColorTextWrapped("Please be patient, depending on usage and load this can take a while.", ImGuiColors.DalamudYellow); UiSharedService.ColorTextWrapped("Please be patient, depending on usage and load this can take a while.", ImGuiColors.DalamudYellow);
if (_uiShared.IconTextButton(FontAwesomeIcon.Ban, "Cancel speedtest")) if (_uiShared.IconTextButton(FontAwesomeIcon.Ban, "Cancel speedtest"))
{ {
_speedTestCts.Cancel(); _speedTestCts?.Cancel();
_speedTestCts.Dispose(); _speedTestCts?.Dispose();
_speedTestCts = new(); _speedTestCts = new();
} }
} }
@@ -476,7 +475,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
private Task<List<string>?>? _downloadServersTask = null; private Task<List<string>?>? _downloadServersTask = null;
private Task<List<string>?>? _speedTestTask = null; private Task<List<string>?>? _speedTestTask = null;
private CancellationTokenSource _speedTestCts = new(); private CancellationTokenSource? _speedTestCts;
private async Task<List<string>?> RunSpeedTest(List<string> servers, CancellationToken token) private async Task<List<string>?> RunSpeedTest(List<string> servers, CancellationToken token)
{ {