Removing a timer that isn't running is a success.
This commit is contained in:
parent
b1af91e788
commit
795499a529
2 changed files with 3 additions and 7 deletions
|
@ -381,11 +381,7 @@ int SDL_RemoveTimer(SDL_TimerID id)
|
|||
}
|
||||
SDL_free(entry);
|
||||
}
|
||||
if (canceled) {
|
||||
return 0;
|
||||
} else {
|
||||
return SDL_SetError("Timer not found");
|
||||
}
|
||||
}
|
||||
|
||||
#else
|
||||
|
|
|
@ -142,7 +142,7 @@ static int timer_addRemoveTimer(void *arg)
|
|||
/* Try to remove timer again (should be a NOOP) */
|
||||
result = SDL_RemoveTimer(id);
|
||||
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 */
|
||||
param = SDLTest_RandomIntegerInRange(-1024, 1024);
|
||||
|
@ -162,7 +162,7 @@ static int timer_addRemoveTimer(void *arg)
|
|||
/* Remove timer again and check that callback was called */
|
||||
result = SDL_RemoveTimer(id);
|
||||
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);
|
||||
|
||||
return TEST_COMPLETED;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue