From ae5564222b7ce27ea8d9a9d83e2c1ce86f90a943 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Thu, 5 Apr 2001 13:07:44 +0000 Subject: [PATCH] (free_frame_menubar) [USE_MOTIF]: Preserve the shell widget's position only if it is non-null. --- src/xmenu.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/xmenu.c b/src/xmenu.c index 99f5c46a959..b4a1a87d4d9 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1885,16 +1885,20 @@ free_frame_menubar (f) BLOCK_INPUT; #ifdef USE_MOTIF - XtVaGetValues (f->output_data.x->widget, XtNx, &x0, XtNy, &y0, NULL); + if (f->output_data.x->widget) + XtVaGetValues (f->output_data.x->widget, XtNx, &x0, XtNy, &y0, NULL); #endif lw_destroy_all_widgets ((LWLIB_ID) f->output_data.x->id); f->output_data.x->menubar_widget = NULL; #ifdef USE_MOTIF - XtVaGetValues (f->output_data.x->widget, XtNx, &x1, XtNy, &y1, NULL); - if (x1 == 0 && y1 == 0) - XtVaSetValues (f->output_data.x->widget, XtNx, x0, XtNy, y0, NULL); + if (f->output_data.x->widget) + { + XtVaGetValues (f->output_data.x->widget, XtNx, &x1, XtNy, &y1, NULL); + if (x1 == 0 && y1 == 0) + XtVaSetValues (f->output_data.x->widget, XtNx, x0, XtNy, y0, NULL); + } #endif UNBLOCK_INPUT; -- 2.39.5