From 8f222220b378fa60f64eeb29a00ffb0a1d7c4dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerd=20M=C3=B6llmann?= Date: Sat, 5 Apr 2025 04:43:15 +0200 Subject: [PATCH] Fix merge for NS * src/nsterm.m ([EmacsWindow constrainFrameRect:toScreen:]): Fix derefering of emacsframe. --- src/nsterm.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nsterm.m b/src/nsterm.m index 0471f82d4d3..af461f51fc0 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -9821,7 +9821,7 @@ nswindow_orderedIndex_sort (id w1, id w2, void *c) /* Don't do anything for child frames because that leads to weird child frame placement in some cases involving Dock placement and Dock Hiding. */ - struct frame *f = ((EmacsView *) [self delegate])->emacsframe; + struct frame *f = *((EmacsView *) [self delegate])->emacsframe; if (FRAME_PARENT_FRAME (f)) return frameRect;