From 64ec6eef0a6b99e152c092499fb7d1b0841d7808 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Thu, 17 Aug 2023 15:10:11 +0200 Subject: [PATCH] Fix Folder.GetStream using FileNotFoundExceptions to detect if a file exists --- OpenRA.Game/FileSystem/Folder.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenRA.Game/FileSystem/Folder.cs b/OpenRA.Game/FileSystem/Folder.cs index ff7d861141..9cbe594a97 100644 --- a/OpenRA.Game/FileSystem/Folder.cs +++ b/OpenRA.Game/FileSystem/Folder.cs @@ -41,7 +41,11 @@ namespace OpenRA.FileSystem public Stream GetStream(string filename) { - try { return File.OpenRead(Path.Combine(Name, filename)); } + var combined = Path.Combine(Name, filename); + if (!File.Exists(combined)) + return null; + + try { return File.OpenRead(combined); } catch { return null; } }