From db84dc8e58a9f4e0f4aa7d15418f91f3a3d22c50 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Sun, 10 Mar 2019 15:31:52 -0700
Subject: [PATCH] Fix crash when closing a fullscreen window.

---
 gdk/quartz/GdkQuartzView.c    | 3 +++
 gdk/quartz/gdkwindow-quartz.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/gdk/quartz/GdkQuartzView.c b/gdk/quartz/GdkQuartzView.c
index 8d8502701d..72e305c5c4 100644
--- a/gdk/quartz/GdkQuartzView.c
+++ b/gdk/quartz/GdkQuartzView.c
@@ -727,6 +727,9 @@
 
 -(void)setFrame: (NSRect)frame
 {
+  if (GDK_WINDOW_DESTROYED (gdk_window))
+    return;
+  
   [super setFrame: frame];
 
   if ([self window])
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index e2e11adaa7..302598a090 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -2730,6 +2730,9 @@ _gdk_quartz_window_update_fullscreen_state (GdkWindow *window)
   gboolean is_fullscreen;
   gboolean was_fullscreen;
 
+  if (GDK_WINDOW_DESTROYED (window) || !WINDOW_IS_TOPLEVEL (window))
+    return;
+  
   is_fullscreen = window_is_fullscreen (window);
   was_fullscreen = (gdk_window_get_state (window) & GDK_WINDOW_STATE_FULLSCREEN) != 0;