ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-01-11 05:45:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return an error if both mouse relative mode and mouse warping are unavailable, instead of asserting.

Browse source
This commit is contained in:
Sam Lantinga 2019-05-23 11:32:36 -07:00
parent 8b57331e71
commit e401b95025
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/events/SDL_mouse.c
View file

@ -765,9 +765,9 @@ SDL_WarpMouseGlobal(int x, int y)
static SDL_bool static SDL_bool
ShouldUseRelativeModeWarp(SDL_Mouse *mouse) ShouldUseRelativeModeWarp(SDL_Mouse *mouse)
{ {
if (!mouse->SetRelativeMouseMode) { if (!mouse->WarpMouse) {
SDL_assert(mouse->WarpMouse); /* Need this functionality for relative mode warp implementation */ /* Need this functionality for relative mode warp implementation */
return SDL_TRUE; return SDL_FALSE;
} }
return SDL_GetHintBoolean(SDL_HINT_MOUSE_RELATIVE_MODE_WARP, SDL_FALSE); return SDL_GetHintBoolean(SDL_HINT_MOUSE_RELATIVE_MODE_WARP, SDL_FALSE);
@ -796,7 +796,7 @@ SDL_SetRelativeMouseMode(SDL_bool enabled)
mouse->relative_mode_warp = SDL_FALSE; mouse->relative_mode_warp = SDL_FALSE;
} else if (enabled && ShouldUseRelativeModeWarp(mouse)) { } else if (enabled && ShouldUseRelativeModeWarp(mouse)) {
mouse->relative_mode_warp = SDL_TRUE; mouse->relative_mode_warp = SDL_TRUE;
} else if (mouse->SetRelativeMouseMode(enabled) < 0) { } else if (!mouse->SetRelativeMouseMode || mouse->SetRelativeMouseMode(enabled) < 0) {
if (enabled) { if (enabled) {
/* Fall back to warp mode if native relative mode failed */ /* Fall back to warp mode if native relative mode failed */
if (!mouse->WarpMouse) { if (!mouse->WarpMouse) {