eden-emu/SDL
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Sam Lantinga 2024-08-04 19:45:18 -07:00
parent b1af91e788
commit 795499a529
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/timer/SDL_timer.c
View file

@ -381,11 +381,7 @@ int SDL_RemoveTimer(SDL_TimerID id)
} }
SDL_free(entry); SDL_free(entry);
} }
if (canceled) { return 0;
return 0;
} else {
return SDL_SetError("Timer not found");
}
} }
#else #else

4
test/testautomation_timer.c
View file

@ -142,7 +142,7 @@ static int timer_addRemoveTimer(void *arg)
/* Try to remove timer again (should be a NOOP) */ /* Try to remove timer again (should be a NOOP) */
result = SDL_RemoveTimer(id); result = SDL_RemoveTimer(id);
SDLTest_AssertPass("Call to SDL_RemoveTimer()"); SDLTest_AssertPass("Call to SDL_RemoveTimer()");
SDLTest_AssertCheck(result < 0, "Check result value, expected: <0, got: %i", result); SDLTest_AssertCheck(result == 0, "Check result value, expected: 0, got: %i", result);
/* Reset state */ /* Reset state */
param = SDLTest_RandomIntegerInRange(-1024, 1024); param = SDLTest_RandomIntegerInRange(-1024, 1024);
@ -162,7 +162,7 @@ static int timer_addRemoveTimer(void *arg)
/* Remove timer again and check that callback was called */ /* Remove timer again and check that callback was called */
result = SDL_RemoveTimer(id); result = SDL_RemoveTimer(id);
SDLTest_AssertPass("Call to SDL_RemoveTimer()"); SDLTest_AssertPass("Call to SDL_RemoveTimer()");
SDLTest_AssertCheck(result < 0, "Check result value, expected: <0, got: %i", result); SDLTest_AssertCheck(result == 0, "Check result value, expected: 0, got: %i", result);
SDLTest_AssertCheck(g_timerCallbackCalled == 1, "Check callback WAS called, expected: 1, got: %i", g_timerCallbackCalled); SDLTest_AssertCheck(g_timerCallbackCalled == 1, "Check callback WAS called, expected: 1, got: %i", g_timerCallbackCalled);
return TEST_COMPLETED; return TEST_COMPLETED;