epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix RCS1257, RCS1258, RCS1261, RCS1262, RCS1265, RCS1266, RCS1267

Browse Source
This commit is contained in:
RoosterDragon
2024-11-25 22:19:51 +00:00
committed by Gustas Kažukauskas
parent a324af1afd
commit 1b2c119b58
23 changed files with 59 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs
View File

@@ -129,7 +129,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
allCategories = allActors.SelectMany(ac => ac.Categories)
.Distinct()
.OrderBy(x => x)
.Order()
.ToArray();
foreach (var c in allCategories)
@@ -149,7 +149,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
s => s.Contains(searchFilter, StringComparison.CurrentCultureIgnoreCase)))
.SelectMany(t => t.Categories)
.Distinct()
.OrderBy(x => x));
.Order());
else
FilteredCategories.AddRange(allCategories);

10
OpenRA.Mods.Common/Widgets/Logic/Installation/DownloadPackageLogic.cs
View File

@@ -191,7 +191,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return;
}
using (var fileStream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.ReadWrite, 8192, true))
await using (var fileStream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.ReadWrite, 8192, true))
{
await response.ReadAsStreamWithProgress(fileStream, OnDownloadProgress, token);
}
@@ -205,7 +205,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var archiveValid = false;
try
{
using (var stream = File.OpenRead(file))
await using (var stream = File.OpenRead(file))
{
var archiveSHA1 = CryptoUtil.SHA1Hash(stream);
Log.Write("install", "Downloaded SHA1: " + archiveSHA1);
@@ -233,7 +233,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var extracted = new List<string>();
try
{
using (var stream = File.OpenRead(file))
await using (var stream = File.OpenRead(file))
{
var packageLoader = modData.ObjectCreator.CreateObject<IPackageLoader>($"{download.Type}Loader");
@@ -253,8 +253,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
Directory.CreateDirectory(Path.GetDirectoryName(targetPath));
extracted.Add(targetPath);
using (var zz = package.GetStream(kv.Value))
using (var f = File.Create(targetPath))
await using (var zz = package.GetStream(kv.Value))
await using (var f = File.Create(targetPath))
await zz.CopyToAsync(f);
}

2
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
View File

@@ -887,7 +887,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (orderManager.LobbyInfo.GlobalSettings.Dedicated)
{
var endpoint = CurrentServerSettings.Target.GetConnectEndPoints().First();
secret = string.Concat(endpoint.Address, "|", endpoint.Port);
secret = $"{endpoint.Address}|{endpoint.Port}";
}
var state = skirmishMode ? DiscordState.InSkirmishLobby : DiscordState.InMultiplayerLobby;