From 16568fc75d5bd69315a922927bc7526874fefadd Mon Sep 17 00:00:00 2001 From: alcexhim Date: Mon, 2 Jun 2014 14:50:03 -0400 Subject: [PATCH] Don't even try to load images if the data directory does not exist --- .../Editors/MarkupEditor.cs | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/CSharp/Libraries/UniversalEditor.UserInterface.WindowsForms/Editors/MarkupEditor.cs b/CSharp/Libraries/UniversalEditor.UserInterface.WindowsForms/Editors/MarkupEditor.cs index b7795ed8..d703376c 100644 --- a/CSharp/Libraries/UniversalEditor.UserInterface.WindowsForms/Editors/MarkupEditor.cs +++ b/CSharp/Libraries/UniversalEditor.UserInterface.WindowsForms/Editors/MarkupEditor.cs @@ -20,18 +20,25 @@ namespace UniversalEditor.Editors base.SupportedObjectModels.Add(typeof(MarkupObjectModel)); - string[] FileNames = System.IO.Directory.GetFiles(String.Join(System.IO.Path.DirectorySeparatorChar.ToString(), new string[] + string dirname = String.Join(System.IO.Path.DirectorySeparatorChar.ToString(), new string[] { "Editors", "Markup", "Images" - })); + }); - foreach (string FileName in FileNames) + // don't even try to load if the data directory does not exist (this should be a global + // Editor functionality, not specific to MarkupEditor...) + if (System.IO.Directory.Exists(dirname)) { - string FileTitle = System.IO.Path.GetFileNameWithoutExtension(FileName); - Image image = Image.FromFile(FileName); - imlSmallIcons.Images.Add(FileTitle, image); + string[] FileNames = System.IO.Directory.GetFiles(dirname); + + foreach (string FileName in FileNames) + { + string FileTitle = System.IO.Path.GetFileNameWithoutExtension(FileName); + Image image = Image.FromFile(FileName); + imlSmallIcons.Images.Add(FileTitle, image); + } } ActionMenuItem mnuMarkup = new ActionMenuItem("mnuMarkup", "&Markup");