From 9a19a798482dfcedc151151cbebca1e676437798 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 4 Dec 2020 20:23:13 +0000
Subject: Cherrypick the fix for the segfault.

---
 macosx/tkMacOSXWm.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 1775cc4..569f531 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -2894,9 +2894,11 @@ WmManageCmd(
 	 * See [4a40c6cace].
 	 */
 
-	winPtr->changes.x -= macWin->xOff;
-	winPtr->changes.y -= macWin->yOff;
-	XMoveWindow(winPtr->display, winPtr->window, 0, 0);
+	if (macWin) {
+	    winPtr->changes.x -= macWin->xOff;
+	    winPtr->changes.y -= macWin->yOff;
+	    XMoveWindow(winPtr->display, winPtr->window, 0, 0);
+	}
 
 	TkFocusSplit(winPtr);
 	Tk_UnmapWindow(frameWin);
-- 
cgit v0.12