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

Fix map installation.

Browse Source
This commit is contained in:
Paul Chote
2021-04-06 13:54:44 +01:00
committed by teinarss
parent f9294f0e9e
commit bb8a634ba8
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Game/Map/MapPreview.cs
View File

@@ -476,15 +476,13 @@ namespace OpenRA
innerData.Status = MapStatus.Downloading; innerData.Status = MapStatus.Downloading;
var installLocation = cache.MapLocations.FirstOrDefault(p => p.Value == MapClassification.User); var installLocation = cache.MapLocations.FirstOrDefault(p => p.Value == MapClassification.User);
if (installLocation.Key == null || !(installLocation.Key is IReadWritePackage)) if (!(installLocation.Key is IReadWritePackage mapInstallPackage))
{ {
Log.Write("debug", "Map install directory not found"); Log.Write("debug", "Map install directory not found");
innerData.Status = MapStatus.DownloadError; innerData.Status = MapStatus.DownloadError;
return; return;
} }
var mapInstallPackage = installLocation.Key as IReadWritePackage;
Task.Run(async () => Task.Run(async () =>
{ {
// Request the filename from the server // Request the filename from the server
@@ -508,8 +506,14 @@ namespace OpenRA
return; return;
} }
response.Headers.TryGetValues("Content-Disposition", out var values); var mapFilename = response.Content.Headers.ContentDisposition?.FileName;
var mapFilename = values.First().Replace("attachment; filename = ", "");
// Map not found
if (string.IsNullOrEmpty(mapFilename))
{
innerData.Status = MapStatus.DownloadError;
return;
}
var fileStream = new MemoryStream(); var fileStream = new MemoryStream();