2 files changed, 8 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 06f807e5e7f..a4b78542ee3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-14  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c (handle_one_xevent): Check that f is not NULL before
+        calling _XEditResCheckMessages.
+
 2006-05-14  Kim F. Storm  <storm@cua.dk>
 
         * xterm.c (handle_one_xevent): Fix crash in 2006-03-24 change.
diff --git a/src/xterm.c b/src/xterm.c
index 3ef756bd42f..bc28f397073 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5803,8 +5803,9 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
             == dpyinfo->Xatom_editres)
           {
             f = x_any_window_to_frame (dpyinfo, event.xclient.window);
-            _XEditResCheckMessages (f->output_data.x->widget, NULL,
-                                    &event, NULL);
+            if (f)
+              _XEditResCheckMessages (f->output_data.x->widget, NULL,
+                                      &event, NULL);
             goto done;
           }
 #endif /* HACK_EDITRES */