* xmenu.c (free_frame_menubar): Only call x_set_window_size if

widget is non-null (Bug#6645).

2 files changed, 8 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 35c4294a9f6..04e74667bc3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-16  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xmenu.c (free_frame_menubar): Only call x_set_window_size if
+        widget is non-null (Bug#6645).
+
 2010-07-15  Andreas Schwab  <schwab@linux-m68k.org>
 
         * xterm.c (x_fully_uncatch_errors, x_trace_wire, x_check_font):
diff --git a/src/xmenu.c b/src/xmenu.c
index 8da68c6d876..82b315f83cb 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1355,15 +1355,15 @@ free_frame_menubar (FRAME_PTR f)
       lw_destroy_all_widgets ((LWLIB_ID) f->output_data.x->id);
       f->output_data.x->menubar_widget = NULL;
 
-#ifdef USE_MOTIF
       if (f->output_data.x->widget)
         {
+#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);
-        }
 #endif
-      x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f));
+          x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f));
+        }
       UNBLOCK_INPUT;
     }
 }