Merge pull request #1827 from pvasilek/fix-1812

Fix #1812
Fix #1814

ILSpy/Commands/DecompileInNewViewCommand.cs

@@ -62,12 +62,11 @@ namespace ICSharpCode.ILSpy.Commands
 		{
 			if (nodes.Length == 0)
 				return;
+
 			var title = string.Join(", ", nodes.Select(x => x.ToString()));
 			DockWorkspace.Instance.Documents.Add(new ViewModels.DecompiledDocumentModel(title, title) { Language = MainWindow.Instance.CurrentLanguage, LanguageVersion = MainWindow.Instance.CurrentLanguageVersion });
 			DockWorkspace.Instance.ActiveDocument = DockWorkspace.Instance.Documents.Last();
-			MainWindow.Instance.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Background, (Action)delegate {
-				DockWorkspace.Instance.GetTextView().DecompileAsync(MainWindow.Instance.CurrentLanguage, nodes, new DecompilationOptions());
-			});
+			MainWindow.Instance.SelectNodes(nodes);
 		}
 	}
 }

ILSpy/Docking/DockWorkspace.cs

@@ -93,6 +93,9 @@ namespace ICSharpCode.ILSpy.Docking
 					if (value is DecompiledDocumentModel ddm) {
 						this.sessionSettings.FilterSettings.Language = ddm.Language;
 						this.sessionSettings.FilterSettings.LanguageVersion = ddm.LanguageVersion;
+						if (ddm.TextView is DecompilerTextView view) {
+							MainWindow.Instance.SelectNodes(view.GetState().DecompiledNodes);
+						}
 					}
 					RaisePropertyChanged(nameof(ActiveDocument));
 				}

ILSpy/MainWindow.xaml.cs

@@ -117,11 +117,8 @@ namespace ICSharpCode.ILSpy
 			};
 
 			DockWorkspace.Instance.LoadSettings(sessionSettings);
-
 			InitializeComponent();
-
 			DockWorkspace.Instance.InitializeLayout(DockManager);
-
 			sessionSettings.FilterSettings.PropertyChanged += filterSettings_PropertyChanged;
 
 			InitMainMenu();