From e3d566134a1baa75beed1c999edffaa70faf1e58 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 3 Jul 2006 15:42:48 +0000 Subject: [PATCH] (Fx_create_frame): Move unwind_create_frame setup down. --- src/xfns.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/xfns.c b/src/xfns.c index 55575d9ec61..dd0510cf0fa 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3075,7 +3075,6 @@ This function is an internal primitive--use `make-frame' instead. */) f->output_data.x->scroll_bar_top_shadow_pixel = -1; f->output_data.x->scroll_bar_bottom_shadow_pixel = -1; #endif /* USE_TOOLKIT_SCROLL_BARS */ - record_unwind_protect (unwind_create_frame, frame); f->icon_name = x_get_arg (dpyinfo, parms, Qicon_name, "iconName", "Title", @@ -3084,6 +3083,9 @@ This function is an internal primitive--use `make-frame' instead. */) f->icon_name = Qnil; FRAME_X_DISPLAY_INFO (f) = dpyinfo; + + /* With FRAME_X_DISPLAY_INFO set up, this unwind-protect is safe. */ + record_unwind_protect (unwind_create_frame, frame); #if GLYPH_DEBUG image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; dpyinfo_refcount = dpyinfo->reference_count; -- 2.39.2