|
|
@ -362,15 +362,22 @@ namespace ICSharpCode.ILSpy |
|
|
|
{ |
|
|
|
ILSpySettings spySettings = this.spySettings; |
|
|
|
this.spySettings = null; |
|
|
|
var loadPreviousAssemblies = Options.MiscSettingsPanel.CurrentMiscSettings.LoadPreviousAssemblies; |
|
|
|
|
|
|
|
// Load AssemblyList only in Loaded event so that WPF is initialized before we start the CPU-heavy stuff.
|
|
|
|
// This makes the UI come up a bit faster.
|
|
|
|
this.assemblyList = assemblyListManager.LoadList(spySettings, sessionSettings.ActiveAssemblyList); |
|
|
|
if (loadPreviousAssemblies) { |
|
|
|
// Load AssemblyList only in Loaded event so that WPF is initialized before we start the CPU-heavy stuff.
|
|
|
|
// This makes the UI come up a bit faster.
|
|
|
|
this.assemblyList = assemblyListManager.LoadList(spySettings, sessionSettings.ActiveAssemblyList); |
|
|
|
} else { |
|
|
|
this.assemblyList = new AssemblyList(AssemblyListManager.DefaultListName); |
|
|
|
assemblyListManager.ClearAll(); |
|
|
|
} |
|
|
|
|
|
|
|
HandleCommandLineArguments(App.CommandLineArguments); |
|
|
|
|
|
|
|
if (assemblyList.GetAssemblies().Length == 0 |
|
|
|
&& assemblyList.ListName == AssemblyListManager.DefaultListName) { |
|
|
|
&& assemblyList.ListName == AssemblyListManager.DefaultListName |
|
|
|
&& loadPreviousAssemblies) { |
|
|
|
LoadInitialAssemblies(); |
|
|
|
} |
|
|
|
|
|
|
@ -731,7 +738,7 @@ namespace ICSharpCode.ILSpy |
|
|
|
OpenFiles(dlg.FileNames); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void OpenFiles(string[] fileNames, bool focusNode = true) |
|
|
|
{ |
|
|
|
if (fileNames == null) |
|
|
|