From 42c84642dd4f7c39d58be4ec5e46eefcfbee4112 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Wed, 24 Mar 2021 18:27:40 +0100 Subject: [PATCH] #2299: Make sure Images are loaded on the UI thread. --- ILSpy/Images/Images.cs | 2 ++ ILSpy/MainWindow.xaml.cs | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ILSpy/Images/Images.cs b/ILSpy/Images/Images.cs index b0cc50f7b..84418fc4a 100644 --- a/ILSpy/Images/Images.cs +++ b/ILSpy/Images/Images.cs @@ -32,6 +32,8 @@ namespace ICSharpCode.ILSpy return new DrawingImage(LoadDrawingGroup(null, "Images/" + icon)); } + public static readonly ImageSource ILSpyIcon = new BitmapImage(new Uri("pack://application:,,,/ILSpy;component/images/ILSpy.ico")); + public static readonly ImageSource ViewCode = Load("ViewCode"); public static readonly ImageSource Save = Load("Save"); public static readonly ImageSource OK = Load("OK"); diff --git a/ILSpy/MainWindow.xaml.cs b/ILSpy/MainWindow.xaml.cs index 61abecbdb..80c0003e0 100644 --- a/ILSpy/MainWindow.xaml.cs +++ b/ILSpy/MainWindow.xaml.cs @@ -111,7 +111,8 @@ namespace ICSharpCode.ILSpy this.sessionSettings = new SessionSettings(spySettings); this.AssemblyListManager = new AssemblyListManager(spySettings); - this.Icon = new BitmapImage(new Uri("pack://application:,,,/ILSpy;component/images/ILSpy.ico")); + // Make sure Images are initialized on the UI thread. + //this.Icon = Images.ILSpyIcon; this.DataContext = new MainWindowDataContext { Workspace = DockWorkspace.Instance,