Browse Source

Reformat code in LoadedAssembly.LoadAssembly

pull/1686/head
Siegfried Pammer 7 years ago
parent
commit
da1fb59c82
  1. 25
      ILSpy/LoadedAssembly.cs

25
ILSpy/LoadedAssembly.cs

@ -145,20 +145,23 @@ namespace ICSharpCode.ILSpy
PEFile LoadAssembly(object state) PEFile LoadAssembly(object state)
{ {
var stream = state as Stream; MetadataReaderOptions options;
PEFile module; if (DecompilerSettingsPanel.CurrentDecompilerSettings.ApplyWindowsRuntimeProjections) {
options = MetadataReaderOptions.ApplyWindowsRuntimeProjections;
} else {
options = MetadataReaderOptions.None;
}
PEFile module;
// runs on background thread // runs on background thread
if (stream != null) if (state is Stream stream) {
{
// Read the module from a precrafted stream // Read the module from a precrafted stream
module = new PEFile(fileName, stream, metadataOptions: DecompilerSettingsPanel.CurrentDecompilerSettings.ApplyWindowsRuntimeProjections ? MetadataReaderOptions.ApplyWindowsRuntimeProjections : MetadataReaderOptions.None); module = new PEFile(fileName, stream, metadataOptions: options);
} } else {
else
{
// Read the module from disk (by default) // Read the module from disk (by default)
module = new PEFile(fileName, new FileStream(fileName, FileMode.Open, FileAccess.Read), PEStreamOptions.PrefetchEntireImage, stream = new FileStream(fileName, FileMode.Open, FileAccess.Read);
metadataOptions: DecompilerSettingsPanel.CurrentDecompilerSettings.ApplyWindowsRuntimeProjections ? MetadataReaderOptions.ApplyWindowsRuntimeProjections : MetadataReaderOptions.None); module = new PEFile(fileName, stream, PEStreamOptions.PrefetchEntireImage,
metadataOptions: options);
} }
if (DecompilerSettingsPanel.CurrentDecompilerSettings.UseDebugSymbols) { if (DecompilerSettingsPanel.CurrentDecompilerSettings.UseDebugSymbols) {
@ -371,7 +374,7 @@ namespace ICSharpCode.ILSpy
} }
loadingAssemblies.Add(file, asm); loadingAssemblies.Add(file, asm);
} }
App.Current.Dispatcher.BeginInvoke((Action)delegate() { App.Current.Dispatcher.BeginInvoke((Action)delegate () {
lock (assemblyList.assemblies) { lock (assemblyList.assemblies) {
assemblyList.assemblies.Add(asm); assemblyList.assemblies.Add(asm);
} }

Loading…
Cancel
Save