ToxicMushroom/mare.client
1
0
Fork 0
mirror of https://github.com/Caraxi/mare.client.git synced 2025-12-13 14:44:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/Penumbra-Sync/client

Browse source
This commit is contained in:
Stanley Dimant 2023-01-18 15:06:26 +01:00
commit 6c3716516e
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MareSynchronos/MareSynchronos.csproj
View file

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<Authors></Authors> <Authors></Authors>
<Company></Company> <Company></Company>
<Version>0.6.5</Version> <Version>0.6.6</Version>
<Description></Description> <Description></Description>
<Copyright></Copyright> <Copyright></Copyright>
<PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl> <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>

4
MareSynchronos/WebAPI/ApIController.Functions.Files.cs
View file

@ -65,7 +65,7 @@ public partial class ApiController
bool alreadyCancelled = false; bool alreadyCancelled = false;
try try
{ {
CancellationTokenSource localTimeoutCts = new CancellationTokenSource(); CancellationTokenSource localTimeoutCts = new();
localTimeoutCts.CancelAfter(TimeSpan.FromSeconds(5)); localTimeoutCts.CancelAfter(TimeSpan.FromSeconds(5));
CancellationTokenSource composite = CancellationTokenSource.CreateLinkedTokenSource(downloadCt, localTimeoutCts.Token); CancellationTokenSource composite = CancellationTokenSource.CreateLinkedTokenSource(downloadCt, localTimeoutCts.Token);
@ -85,7 +85,7 @@ public partial class ApiController
req.EnsureSuccessStatusCode(); req.EnsureSuccessStatusCode();
localTimeoutCts.Dispose(); localTimeoutCts.Dispose();
composite.Dispose(); composite.Dispose();
localTimeoutCts = new CancellationTokenSource(); localTimeoutCts = new();
localTimeoutCts.CancelAfter(TimeSpan.FromSeconds(5)); localTimeoutCts.CancelAfter(TimeSpan.FromSeconds(5));
composite = CancellationTokenSource.CreateLinkedTokenSource(downloadCt, localTimeoutCts.Token); composite = CancellationTokenSource.CreateLinkedTokenSource(downloadCt, localTimeoutCts.Token);
} }