From: Karl Heuer <kwzh@gnu.org>
Date: Mon, 25 Apr 1994 22:55:33 +0000 (+0000)
Subject: (XTmouse_position, XTread_socket): Don't use last_mouse_frame if it's dead.
X-Git-Tag: emacs-19.34~8752
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=06ef4a3f7e814690a852ef8427c75b8e3c6a7900;p=emacs.git

(XTmouse_position, XTread_socket): Don't use last_mouse_frame if it's dead.
---

diff --git a/src/xterm.c b/src/xterm.c
index 0ae434b2b17..f2a45d6514f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2485,7 +2485,7 @@ XTmouse_position (f, bar_window, part, x, y, time)
 
 	win = root;
 
-	if (x_mouse_grabbed)
+	if (x_mouse_grabbed && FRAME_LIVE_P (last_mouse_frame))
 	  {
 	    /* If mouse was grabbed on a frame, give coords for that frame
 	       even if the mouse is now outside it.  */
@@ -3993,7 +3993,7 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
 #ifdef HAVE_X11
 	case MotionNotify:
 	  {
-	    if (x_mouse_grabbed)
+	    if (x_mouse_grabbed && FRAME_LIVE_P (last_mouse_frame))
 	      f = last_mouse_frame;
 	    else
 	      f = x_window_to_frame (event.xmotion.window);