Browse Source

Fix http://community.sharpdevelop.net/forums/t/11954.aspx - Cannot select project resource as form icon: "This operation can be called on the main thread only"

pull/1/head
Daniel Grunwald 15 years ago
parent
commit
eedd9ddba7
  1. 15
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ImageResourceEditorDialog.cs

15
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ImageResourceEditorDialog.cs

@ -17,6 +17,7 @@ using ICSharpCode.Core.WinForms;
using ICSharpCode.FormsDesigner.Services; using ICSharpCode.FormsDesigner.Services;
using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project; using ICSharpCode.SharpDevelop.Project;
namespace ICSharpCode.FormsDesigner.Gui namespace ICSharpCode.FormsDesigner.Gui
@ -369,11 +370,15 @@ namespace ICSharpCode.FormsDesigner.Gui
Dictionary<string, object> GetResources(string fileName) Dictionary<string, object> GetResources(string fileName)
{ {
Stream s; Stream s = null;
OpenedFile file = FileService.GetOpenedFile(fileName); WorkbenchSingleton.SafeThreadCall(
if (file != null) { delegate {
s = file.OpenRead(); OpenedFile file = FileService.GetOpenedFile(fileName);
} else { if (file != null) {
s = file.OpenRead();
}
});
if (s == null) {
s = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read); s = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read);
} }
using(s) { using(s) {

Loading…
Cancel
Save