Merge pull request #11140 from Mailaender/map-preview-package-nre

Fixed NullReferenceExceptions if package opening fails.
This commit is contained in:
Oliver Brakmann
2016-04-17 20:23:59 +02:00

View File

@@ -486,8 +486,13 @@ namespace OpenRA
Game.RunAfterTick(() => Game.RunAfterTick(() =>
{ {
var package = modData.ModFiles.OpenPackage(mapFilename, mapInstallPackage); var package = modData.ModFiles.OpenPackage(mapFilename, mapInstallPackage);
UpdateFromMap(package, mapInstallPackage, MapClassification.User, null, GridType); if (package == null)
onSuccess(); innerData.Status = MapStatus.DownloadError;
else
{
UpdateFromMap(package, mapInstallPackage, MapClassification.User, null, GridType);
onSuccess();
}
}); });
}; };