fix winforms shutdown crashes

WildernessLabs · Feb 13, 2024 · 7b6085d · 7b6085d
1 parent 9e16609
commit 7b6085d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/...eadow.Foundation.Libraries_and_Frameworks/Graphics.MicroLayout/Driver/Controls/Control.cs b/...eadow.Foundation.Libraries_and_Frameworks/Graphics.MicroLayout/Driver/Controls/Control.cs
@@ -79,7 +79,7 @@ public virtual bool IsVisible
     /// <summary>
     /// Gets or sets the left coordinate of the control.
     /// </summary>
-    public int Left
+    public virtual int Left
     {
         get => _left;
         set => SetInvalidatingProperty(ref _left, value);
@@ -88,7 +88,7 @@ public int Left
     /// <summary>
     /// Gets or sets the top coordinate of the control.
     /// </summary>
-    public int Top
+    public virtual int Top
     {
         get => _top;
         set => SetInvalidatingProperty(ref _top, value);
@@ -97,7 +97,7 @@ public int Top
     /// <summary>
     /// Gets or sets the width of the control.
     /// </summary>
-    public int Width
+    public virtual int Width
     {
         get => _width;
         set => SetInvalidatingProperty(ref _width, value);
@@ -106,7 +106,7 @@ public int Width
     /// <summary>
     /// Gets or sets the height of the control.
     /// </summary>
-    public int Height
+    public virtual int Height
     {
         get => _height;
         set => SetInvalidatingProperty(ref _height, value);
@@ -115,12 +115,12 @@ public int Height
     /// <summary>
     /// Gets the bottom coordinate of the control.
     /// </summary>
-    public int Bottom => Top + Height;
+    public virtual int Bottom => Top + Height;
 
     /// <summary>
     /// Gets the right coordinate of the control.
     /// </summary>
-    public int Right => Left + Width;
+    public virtual int Right => Left + Width;
 
     /// <summary>
     /// Refreshes the control by redrawing it on the specified <see cref="MicroGraphics"/> surface.

diff --git a/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Driver/WinForms.cs b/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Driver/WinForms.cs
@@ -87,15 +87,26 @@ protected override void OnClick(EventArgs e)
     /// </summary>
     void IPixelDisplay.Show()
     {
-        this.Invalidate(true);
+        if (this.IsDisposed)
+        {
+            return;
+        }
 
-        if (InvokeRequired)
+        try
         {
-            Invoke(Update);
+            this.Invalidate(true);
+            if (InvokeRequired)
+            {
+                Invoke(Update);
+            }
+            else
+            {
+                this.Update();
+            }
         }
-        else
+        catch (ObjectDisposedException)
         {
-            this.Update();
+            // NOP - can happen when quitting application
         }
     }
 

diff --git a/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Driver/WinFormsPixelBuffer.cs b/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Driver/WinFormsPixelBuffer.cs
@@ -108,9 +108,13 @@ public void Fill(int originX, int originY, int width, int height, Color color)
                 }
             }
         }
+        catch (ArgumentException)
+        {
+            // NOP - can happen on app shutdown
+        }
         catch (InvalidOperationException)
         {
-            // NOP
+            // NOP - can happen on app shutdown
         }
     }