gallant/SDL2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Prevent setting an error "invalid display" when the parameter displayID hasn't been set.

Browse source
This commit is contained in:
Sylvain 2023-01-30 10:36:48 +01:00 committed by Sylvain Becker
parent b07f8e987b
commit d66f27376e
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/video/SDL_video.c
View file

@ -394,7 +394,7 @@ static int SDLCALL cmpmodes(const void *A, const void *B)
return 0;
}
static int SDL_UninitializedVideo()
static int SDL_UninitializedVideo(void)
{
return SDL_SetError("Video subsystem has not been initialized");
}
@ -558,7 +558,7 @@ pre_driver_error:
return -1;
}
const char *SDL_GetCurrentVideoDriver()
const char *SDL_GetCurrentVideoDriver(void)
{
if (_this == NULL) {
SDL_UninitializedVideo();
@ -577,7 +577,7 @@ SDL_bool SDL_IsVideoContextExternal(void)
return SDL_GetHintBoolean(SDL_HINT_VIDEO_EXTERNAL_CONTEXT, SDL_FALSE);
}
SDL_bool SDL_OnVideoThread()
SDL_bool SDL_OnVideoThread(void)
{
return (_this && SDL_ThreadID() == _this->thread) ? SDL_TRUE : SDL_FALSE;
}
@ -1256,7 +1256,8 @@ SDL_DisplayID SDL_GetDisplayForWindowCoordinate(int coordinate)
if (SDL_WINDOWPOS_ISUNDEFINED(coordinate) ||
SDL_WINDOWPOS_ISCENTERED(coordinate)) {
displayID = (coordinate & 0xFFFF);
if (SDL_GetDisplayIndex(displayID) < 0) {
/* 0 or invalid */
if (displayID == 0 || SDL_GetDisplayIndex(displayID) < 0) {
displayID = SDL_GetPrimaryDisplay();
}
}