summaryrefslogtreecommitdiff
path: root/src/xterm.c
diff options
context:
space:
mode:
authorKim F. Storm <storm@cua.dk>2006-05-14 00:30:46 +0000
committerKim F. Storm <storm@cua.dk>2006-05-14 00:30:46 +0000
commit295fa1d4722339a1aa66c13636ddd2201f0c679d (patch)
tree11b7a5f1e166cf222e20f4ddc277f1edc37c938b /src/xterm.c
parent0f479f06f1fabcd5683156098a0631a34a3d5c42 (diff)
downloademacs-295fa1d4722339a1aa66c13636ddd2201f0c679d.tar.gz
(handle_one_xevent): Fix crash in 2006-03-24 change.
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xterm.c b/src/xterm.c
index ba51dbb8f55..3ef756bd42f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6084,7 +6084,8 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
f = x_any_window_to_frame (dpyinfo, event.xkey.window);
if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)
- && !EQ (f->tool_bar_window, dpyinfo->mouse_face_window))
+ && (f == 0
+ || !EQ (f->tool_bar_window, dpyinfo->mouse_face_window)))
{
clear_mouse_face (dpyinfo);
dpyinfo->mouse_face_hidden = 1;