mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-05 19:08:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make SDL_RegisterEvents() thread-safe

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/12457

(cherry picked from commit 82552e5b7c)
This commit is contained in:
Sam Lantinga
2025-03-04 10:22:20 -08:00
parent ac09af2600
commit de11dd3d60
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/events/SDL_events.c
View File

@@ -110,7 +110,7 @@ typedef struct
} SDL_DisabledEventBlock; } SDL_DisabledEventBlock;
static SDL_DisabledEventBlock *SDL_disabled_events[256]; static SDL_DisabledEventBlock *SDL_disabled_events[256];
static Uint32 SDL_userevents = SDL_EVENT_USER; static SDL_AtomicInt SDL_userevents;
typedef struct SDL_TemporaryMemory typedef struct SDL_TemporaryMemory
{ {
@@ -1893,9 +1893,11 @@ Uint32 SDL_RegisterEvents(int numevents)
{ {
Uint32 event_base = 0; Uint32 event_base = 0;
if ((numevents > 0) && (SDL_userevents + numevents <= SDL_EVENT_LAST)) { if (numevents > 0) {
event_base = SDL_userevents; int value = SDL_AddAtomicInt(&SDL_userevents, numevents);
SDL_userevents += numevents; if (value >= 0 && value <= (SDL_EVENT_LAST - SDL_EVENT_USER)) {
event_base = (Uint32)(SDL_EVENT_USER + value);
}
} }
return event_base; return event_base;
} }