* macterm.c (XTread_socket): Checks for valid, visible window

	before sending a scroll-wheel event.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3f0eb5db6a994e8fe276c8e445f0b0af354dd208..c110217d1e63bb128692143185a3af22a63914c4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-20  Steven Tamm  <steventamm@mac.com>
+
+       * macterm.c (XTread_socket): Checks for valid, visible window
+       before sending a scroll-wheel event.
+
 2003-01-20  Richard M. Stallman  <rms@gnu.org>
 
        * xdisp.c (redisplay_window): If mini window's buffer is not

diff --git a/src/macterm.c b/src/macterm.c
index cae4172854e6a3c2683eb7e638a706b7fb890073..e969a4b6dce5e05c0bfd3b17635317cf3eaf7e71 100644 (file)
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -12644,6 +12644,13 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
                Point point;
                WindowPtr window_ptr = FrontNonFloatingWindow ();
                struct mac_output *mwp = (mac_output *) GetWRefCon (window_ptr);
+               if (!IsValidWindowPtr (window_ptr))
+                 {
+                   SysBeep(1);
+                   UNBLOCK_INPUT;
+                   return 0;
+                 }
+
                GetEventParameter(eventRef, kEventParamMouseWheelDelta,
                                  typeSInt32, NULL, sizeof (SInt32),
                                  NULL, &delta);