From c96e12ba58fe3456aa27ebe17ab59aadbe1520c7 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 19 Apr 2024 10:42:59 -0600 Subject: [PATCH] expand null/destroyed tests for gdk objects in NSView methods --- libs/tk/ydk/quartz/GdkQuartzView.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/tk/ydk/quartz/GdkQuartzView.c b/libs/tk/ydk/quartz/GdkQuartzView.c index b941ae3c34..c567bd4cef 100644 --- a/libs/tk/ydk/quartz/GdkQuartzView.c +++ b/libs/tk/ydk/quartz/GdkQuartzView.c @@ -604,7 +604,7 @@ - (void) setNeedsDisplay:(BOOL)yn { - if (GDK_WINDOW_DESTROYED (gdk_window)) { + if (!gdk_window || GDK_WINDOW_DESTROYED (gdk_window)) { [super setNeedsDisplay:yn]; return; } @@ -643,12 +643,17 @@ - (void) setNeedsDisplayInRect:(NSRect)rect { + if (!gdk_window || GDK_WINDOW_DESTROYED (gdk_window)) { + [super setNeedsDisplayInRect:rect]; + return; + } + GdkWindowObject* private = GDK_WINDOW_OBJECT (gdk_window); GdkWindowImplQuartz* impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); if (!impl) { - [super setNeedsDisplayInRect:rect]; - return; + [super setNeedsDisplayInRect:rect]; + return; } GdkRectangle r = { rect.origin.x, rect.origin.y, rect.size.width, rect.size.height };