Browse Source

#2299: Make sure Images are loaded on the UI thread.

pull/2357/head
Siegfried Pammer 5 years ago
parent
commit
42c84642dd
  1. 2
      ILSpy/Images/Images.cs
  2. 3
      ILSpy/MainWindow.xaml.cs

2
ILSpy/Images/Images.cs

@ -32,6 +32,8 @@ namespace ICSharpCode.ILSpy @@ -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");

3
ILSpy/MainWindow.xaml.cs

@ -111,7 +111,8 @@ namespace ICSharpCode.ILSpy @@ -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,

Loading…
Cancel
Save