From 66359b70583163e4a7c0b4610141adbe7a7e5a67 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Wed, 18 Aug 2010 23:40:05 +1200
Subject: [PATCH] Speed up FileSystem

---
 OpenRA.FileFormats/FileSystem.cs | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/OpenRA.FileFormats/FileSystem.cs b/OpenRA.FileFormats/FileSystem.cs
index f76689ef80..4147b9cedf 100644
--- a/OpenRA.FileFormats/FileSystem.cs
+++ b/OpenRA.FileFormats/FileSystem.cs
@@ -67,11 +67,8 @@ namespace OpenRA.FileFormats
 		static Stream GetFromCache( Cache<uint, List<IFolder>> index, string filename )
 		{
 			foreach( var folder in index[ PackageEntry.HashFilename( filename ) ] )
-			{
-				Stream s = folder.GetContent(filename);
-				if( s != null )
-					return s;
-			}
+				if (folder.Exists(filename))
+					return folder.GetContent(filename);
 			return null;
 		}
 
@@ -86,9 +83,8 @@ namespace OpenRA.FileFormats
 
 			foreach( IFolder folder in mountedFolders )
 			{
-				Stream s = folder.GetContent(filename);
-				if( s != null )
-					return s;
+				if (folder.Exists(filename))
+					return folder.GetContent(filename);
 			}
 
 			throw new FileNotFoundException( string.Format( "File not found: {0}", filename ), filename );
@@ -109,11 +105,8 @@ namespace OpenRA.FileFormats
 			foreach( var ext in exts )
 			{
 				foreach( IFolder folder in mountedFolders )
-				{
-					Stream s = folder.GetContent( filename + ext );
-					if( s != null )
-						return s;
-				}
+					if (folder.Exists(filename + ext))
+						return folder.GetContent( filename + ext );
 			}
 
 			throw new FileNotFoundException( string.Format( "File not found: {0}", filename ), filename );