From 4e6ff7616c892c162fb2ebc237326355e53d5625 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sat, 24 Dec 2011 19:41:45 +1300 Subject: [PATCH] tidy in FileSystem --- OpenRA.FileFormats/Filesystem/FileSystem.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/OpenRA.FileFormats/Filesystem/FileSystem.cs b/OpenRA.FileFormats/Filesystem/FileSystem.cs index daafff5ce9..396b719763 100644 --- a/OpenRA.FileFormats/Filesystem/FileSystem.cs +++ b/OpenRA.FileFormats/Filesystem/FileSystem.cs @@ -158,21 +158,20 @@ namespace OpenRA.FileFormats public static Assembly ResolveAssembly(object sender, ResolveEventArgs e) { foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) - { if (assembly.FullName == e.Name) return assembly; - } - string[] frags = e.Name.Split(','); + var frags = e.Name.Split(','); var filename = frags[0] + ".dll"; + Assembly a; if (assemblyCache.TryGetValue(filename, out a)) return a; if (FileSystem.Exists(filename)) - using (Stream s = FileSystem.Open(filename)) + using (var s = FileSystem.Open(filename)) { - byte[] buf = new byte[s.Length]; + var buf = new byte[s.Length]; s.Read(buf, 0, buf.Length); a = Assembly.Load(buf); assemblyCache.Add(filename, a);