geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clarify that timeout == 0 is handled at the top of SDL_WaitEventTimeout()

main
Sam Lantinga 2022-01-06 13:30:26 -08:00
parent 8ff2166855
commit 2592e6219b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/events/SDL_events.c
View File

@ -974,8 +974,7 @@ SDL_WaitEventTimeout(SDL_Event * event, int timeout)
{ {
SDL_VideoDevice *_this = SDL_GetVideoDevice(); SDL_VideoDevice *_this = SDL_GetVideoDevice();
SDL_Window *wakeup_window; SDL_Window *wakeup_window;
Uint32 start = 0; Uint32 start, expiration;
Uint32 expiration = 0;
SDL_bool include_sentinel = (timeout == 0) ? SDL_TRUE : SDL_FALSE; SDL_bool include_sentinel = (timeout == 0) ? SDL_TRUE : SDL_FALSE;
/* If there isn't a poll sentinel event pending, pump events and add one */ /* If there isn't a poll sentinel event pending, pump events and add one */
@ -1006,10 +1005,15 @@ retry:
/* Has existing events */ /* Has existing events */
return 1; return 1;
} }
/* We should have completely handled timeout == 0 above */
SDL_assert(timeout != 0);
if (timeout > 0) { if (timeout > 0) {
start = SDL_GetTicks(); start = SDL_GetTicks();
expiration = start + timeout; expiration = start + timeout;
} else {
start = 0;
expiration = 0;
} }
if (_this && _this->WaitEventTimeout && _this->SendWakeupEvent && !SDL_events_need_polling()) { if (_this && _this->WaitEventTimeout && _this->SendWakeupEvent && !SDL_events_need_polling()) {