From 4c2c30e9514e0b1f694aadb246668cfd66a6d289 Mon Sep 17 00:00:00 2001
From: Doug Binks <doug@enkisoftware.com>
Date: Fri, 21 Nov 2025 18:00:27 +0000
Subject: [PATCH] wait-events glfwWaitEventsTimeout bugfixes

---
 src/win32_window.c | 2 +-
 src/window.c       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/win32_window.c b/src/win32_window.c
index 37d8830e5..efaab42db 100644
--- a/src/win32_window.c
+++ b/src/win32_window.c
@@ -2187,7 +2187,7 @@ void _glfwWaitEventsTimeoutWin32(double timeout)
         ret = MsgWaitForMultipleObjects(0, NULL, FALSE, (DWORD) (timeout * 1e3), QS_ALLINPUT);
 
         _glfwPollEventsWin32();
-    } while (_glfw.newEventsRcvd == GLFW_FALSE || ret == WAIT_TIMEOUT);
+    } while (_glfw.newEventsRcvd == GLFW_FALSE && ret != WAIT_TIMEOUT);
 }
 
 void _glfwPostEmptyEventWin32(void)
diff --git a/src/window.c b/src/window.c
index cef6699a8..fa827fc41 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1209,6 +1209,7 @@ GLFWAPI void glfwWaitEventsTimeout(double timeout)
         return;
     }
 
+    _glfw.newEventsRcvd = GLFW_FALSE;
     _glfw.platform.waitEvents();
     _glfw.platform.waitEventsTimeout(timeout);
 }