Better handling of paint failures

cyotek · Jan 16, 2020 · 1003c62 · 1003c62
1 parent edd0f20
commit 1003c62
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Cyotek ImageBox Change Log
 
+## 1.2.2
+
+### Fixed
+
+* Any exception during image painting will now be caught, and the error text printed
+  in lieu of the image
+* Fixed a crash that could occur when dragging a selection if the selection was empty
+
 ## 1.2
 
 ### Changed

diff --git a/Cyotek.Windows.Forms.ImageBox/ImageBox.cs b/Cyotek.Windows.Forms.ImageBox/ImageBox.cs
@@ -7,7 +7,7 @@
 namespace Cyotek.Windows.Forms
 {
   // Cyotek ImageBox
-  // Copyright (c) 2010-2017 Cyotek Ltd.
+  // Copyright (c) 2010-2020 Cyotek Ltd.
   // http://cyotek.com
   // http://cyotek.com/blog/tag/imagebox
 
@@ -2953,13 +2953,9 @@ protected virtual void DrawImage(Graphics g)
 
         g.DrawImage(this.Image, this.GetImageViewPort(), this.GetSourceImageRegion(), GraphicsUnit.Pixel);
       }
-      catch (ArgumentException)
+      catch (Exception ex)
       {
-        // ignore errors that occur due to the image being disposed
-      }
-      catch (OutOfMemoryException)
-      {
-        // also ignore errors that occur due to running out of memory
+        TextRenderer.DrawText(g, ex.Message, this.Font, this.ClientRectangle, this.ForeColor, this.BackColor, TextFormatFlags.VerticalCenter | TextFormatFlags.HorizontalCenter | TextFormatFlags.WordBreak | TextFormatFlags.NoPadding | TextFormatFlags.NoPrefix);
       }
 
       g.PixelOffsetMode = currentPixelOffsetMode;