summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYuuki Harano <masm+github@masm11.me>2020-09-29 17:20:59 +0900
committerJeff Walsh <jeff.walsh@drtusers-MacBook-Pro.local>2020-11-24 12:24:40 +1100
commitb60d4c9db018bf64ea2eb1ecf434708a7ee82c67 (patch)
tree270a3c70ab3ee4d03bc1ed8494d4502d82de95dd /src
parent0b69b73baa1e6fb2380e86aa5fab89d5f3a5b061 (diff)
Fix crash on creating child frames.
* src/pgtkfns.c (frame_geometry): Returns nil when no widget.
Diffstat (limited to 'src')
-rw-r--r--src/pgtkfns.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index c6909ba3d63..4ecb03b91c0 100644
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -3316,6 +3316,8 @@ frame_geometry (Lisp_Object frame, Lisp_Object attribute)
gtk_window_get_position (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
&left_pos, &top_pos);
} else {
+ if (FRAME_GTK_WIDGET (f) == NULL)
+ return Qnil; /* This can occur while creating a frame. */
GtkAllocation alloc;
gtk_widget_get_allocation (FRAME_GTK_WIDGET (f), &alloc);
left_pos = alloc.x;