1 files changed, 6 insertions, 2 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 1b91915f4fb..16711587b5c 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -4052,8 +4052,12 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
                   }
                 else if (event.type == ButtonRelease)
                   {
-                    if (!f) f = last_mouse_press_frame;
-                    SET_SAVED_BUTTON_EVENT;
+                    if (!f)
+                      f = last_mouse_press_frame;
+                    if (f)
+                      {
+                        SET_SAVED_BUTTON_EVENT;
+                      }
                   }
                 else
                   goto OTHER;