geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle recursion in SDL_UpdateMouseCapture() 

Fixes https://github.com/libsdl-org/SDL/pull/5608
main
Sam Lantinga 2022-05-18 17:15:10 -07:00
parent dbd54dd708
commit 7044452dd6
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/events/SDL_mouse.c
View File

@ -1028,21 +1028,32 @@ SDL_UpdateMouseCapture(SDL_bool force_release)
} }
if (capture_window != mouse->capture_window) { if (capture_window != mouse->capture_window) {
if (mouse->capture_window) { /* We can get here recursively on Windows, so make sure we complete
mouse->CaptureMouse(NULL); * all of the window state operations before we change the capture state
mouse->capture_window->flags &= ~SDL_WINDOW_MOUSE_CAPTURE; * (e.g. https://github.com/libsdl-org/SDL/pull/5608)
mouse->capture_window = NULL; */
SDL_Window *previous_capture = mouse->capture_window;
if (previous_capture) {
previous_capture->flags &= ~SDL_WINDOW_MOUSE_CAPTURE;
} }
if (capture_window) { if (capture_window) {
if (mouse->CaptureMouse(capture_window) < 0) {
/* CaptureMouse() will have set an error */
return -1;
}
capture_window->flags |= SDL_WINDOW_MOUSE_CAPTURE; capture_window->flags |= SDL_WINDOW_MOUSE_CAPTURE;
} }
mouse->capture_window = capture_window; mouse->capture_window = capture_window;
if (mouse->CaptureMouse(capture_window) < 0) {
/* CaptureMouse() will have set an error, just restore the state */
if (previous_capture) {
previous_capture->flags |= SDL_WINDOW_MOUSE_CAPTURE;
}
if (capture_window) {
capture_window->flags &= ~SDL_WINDOW_MOUSE_CAPTURE;
}
return -1;
}
} }
return 0; return 0;
} }