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

tidy in FileSystem

Browse Source
This commit is contained in:
Chris Forbes
2011-12-24 19:41:45 +13:00
parent f2dd5eb0a3
commit 4e6ff7616c
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.FileFormats/Filesystem/FileSystem.cs
View File

@@ -158,21 +158,20 @@ namespace OpenRA.FileFormats
public static Assembly ResolveAssembly(object sender, ResolveEventArgs e) public static Assembly ResolveAssembly(object sender, ResolveEventArgs e)
{ {
foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
{
if (assembly.FullName == e.Name) if (assembly.FullName == e.Name)
return assembly; return assembly;
}
string[] frags = e.Name.Split(','); var frags = e.Name.Split(',');
var filename = frags[0] + ".dll"; var filename = frags[0] + ".dll";
Assembly a; Assembly a;
if (assemblyCache.TryGetValue(filename, out a)) if (assemblyCache.TryGetValue(filename, out a))
return a; return a;
if (FileSystem.Exists(filename)) 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); s.Read(buf, 0, buf.Length);
a = Assembly.Load(buf); a = Assembly.Load(buf);
assemblyCache.Add(filename, a); assemblyCache.Add(filename, a);