Merge pull request #730 from AvaloniaUI/fixes/729-gtk-window-close

GTK: Don't try to invalidate an already closed window.
10 years ago · 7b4c10a7f8
1 changed files with 3 additions and 1 deletions
--- a/src/Gtk/Avalonia.Gtk/WindowImplBase.cs
+++ b/src/Gtk/Avalonia.Gtk/WindowImplBase.cs
@ -134,7 +134,7 @@ namespace Avalonia.Gtk

        public void Invalidate(Rect rect)
        {
-            if (_window.GdkWindow != null)
+            if (_window?.GdkWindow != null)
                _window.GdkWindow.InvalidateRect(
                    new Rectangle((int) rect.X, (int) rect.Y, (int) rect.Width, (int) rect.Height), true);
        }
@ -306,7 +306,9 @@ namespace Avalonia.Gtk

        public void Dispose()
        {
+            _window.Hide();
            _window.Dispose();
+            _window = null;
        }
    }
 }