GitHub/Facepunch.Steamworks
2
0
Fork 0
mirror of https://github.com/Facepunch/Facepunch.Steamworks.git synced 2024-12-24 13:45:37 +03:00
Code Issues Projects Releases Wiki Activity

Fix IpList queries not cancelling when disposed

Browse Source
This commit is contained in:
Rohan Singh 2024-07-16 22:07:37 -04:00
parent f8960c8971
commit 93223cb30a
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Facepunch.Steamworks/ServerList/Base.cs
View File

@ -135,7 +135,7 @@ void ReleaseQuery()
}
}
public void Dispose()
public virtual void Dispose()
{
ReleaseQuery();
}

29
Facepunch.Steamworks/ServerList/IpList.cs
View File

@ -1,9 +1,5 @@
using Steamworks.Data;
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
namespace Steamworks.ServerList
@ -30,15 +26,17 @@ public override async Task<bool> RunQueryAsync( float timeoutSeconds = 10 )
var ips = Ips.ToArray();
while ( true )
wantsCancel = false;
while ( !wantsCancel )
{
var sublist = ips.Skip( pointer ).Take( blockSize );
if ( sublist.Count() == 0 )
var sublist = ips.Skip( pointer ).Take( blockSize ).ToList();
if ( sublist.Count == 0 )
break;
using ( var list = new ServerList.Internet() )
{
list.AddFilter( "or", sublist.Count().ToString() );
list.AddFilter( "or", sublist.Count.ToString() );
foreach ( var server in sublist )
{
@ -47,9 +45,6 @@ public override async Task<bool> RunQueryAsync( float timeoutSeconds = 10 )
await list.RunQueryAsync( timeoutSeconds );
if ( wantsCancel )
return false;
Responsive.AddRange( list.Responsive );
Responsive = Responsive.Distinct().ToList();
Unresponsive.AddRange( list.Unresponsive );
@ -64,9 +59,17 @@ public override async Task<bool> RunQueryAsync( float timeoutSeconds = 10 )
return true;
}
// note: Cancel doesn't get called in Dispose because request is always null for this class
public override void Cancel()
{
wantsCancel = true;
}
public override void Dispose()
{
base.Dispose();
wantsCancel = true;
}
}
}
}