SD2-1132

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1990 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs

@@ -69,16 +69,19 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 		
 		void ApplicationIconComboBoxTextChanged(object sender, EventArgs e)
 		{
-			string applicationIcon = Path.Combine(baseDirectory, Get<ComboBox>("applicationIcon").Text);
+			if(FileUtility.IsValidFileName(Get<ComboBox>("applicationIcon").Text))
-			if (File.Exists(applicationIcon)) {
+			{
-				try {
+				string applicationIcon = Path.Combine(baseDirectory, Get<ComboBox>("applicationIcon").Text);
-					Get<PictureBox>("applicationIcon").Image = Image.FromFile(applicationIcon);
+				if (File.Exists(applicationIcon)) {
-				} catch (OutOfMemoryException) {
+					try {
+						Get<PictureBox>("applicationIcon").Image = Image.FromFile(applicationIcon);
+					} catch (OutOfMemoryException) {
+						Get<PictureBox>("applicationIcon").Image = null;
+						MessageService.ShowErrorFormatted("${res:Dialog.ProjectOptions.ApplicationSettings.InvalidIconFile}", Path.GetFullPath(applicationIcon));
+					}
+				} else {
 					Get<PictureBox>("applicationIcon").Image = null;
-					MessageService.ShowErrorFormatted("${res:Dialog.ProjectOptions.ApplicationSettings.InvalidIconFile}", Path.GetFullPath(applicationIcon));
 				}
-			} else {
-				Get<PictureBox>("applicationIcon").Image = null;
 			}
 		}
 	}