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

Revert "Removing a timer that isn't running is a success."

Browse Source 
This reverts commit 795499a529.

This breaks compatibility with SDL2 and there isn't a compelling reason to make this change.
This commit is contained in:
Sam Lantinga
2024-08-05 10:35:28 -07:00
parent d223264f17
commit d68d32e12c
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/timer/SDL_timer.c
View File

@@ -353,6 +353,7 @@ int SDL_RemoveTimer(SDL_TimerID id)
{
SDL_TimerData *data = &SDL_timer_data;
SDL_TimerMap *prev, *entry;
SDL_bool canceled = SDL_FALSE;
if (!id) {
return SDL_InvalidParamError("id");
@@ -376,10 +377,15 @@ int SDL_RemoveTimer(SDL_TimerID id)
if (entry) {
if (!SDL_AtomicGet(&entry->timer->canceled)) {
SDL_AtomicSet(&entry->timer->canceled, 1);
canceled = SDL_TRUE;
}
SDL_free(entry);
}
return 0;
if (canceled) {
return 0;
} else {
return SDL_SetError("Timer not found");
}
}
#else