Browse Source

SD2-738 - OutOfMemoryException when trying to set the application's icon to a file which is not an icon. An error message is now shown to the user informing that the icon is invalid.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.0@1236 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Matt Ward 20 years ago
parent
commit
c8e7da22b7
  1. BIN
      data/resources/StringResources.fr.resources
  2. BIN
      data/resources/StringResources.it.resources
  3. BIN
      data/resources/StringResources.nl.resources
  4. BIN
      data/resources/StringResources.se.resources
  5. 7
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs
  6. BIN
      src/Main/StartUp/Project/Resources/StringResources.resources

BIN
data/resources/StringResources.fr.resources

Binary file not shown.

BIN
data/resources/StringResources.it.resources

Binary file not shown.

BIN
data/resources/StringResources.nl.resources

Binary file not shown.

BIN
data/resources/StringResources.se.resources

Binary file not shown.

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

@ -74,7 +74,12 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels @@ -74,7 +74,12 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
{
string applicationIcon = Path.Combine(baseDirectory, Get<ComboBox>("applicationIcon").Text);
if (File.Exists(applicationIcon)) {
Get<PictureBox>("applicationIcon").Image = Image.FromFile(applicationIcon);
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;
}

BIN
src/Main/StartUp/Project/Resources/StringResources.resources

Binary file not shown.
Loading…
Cancel
Save