Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-30 05:47:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent a crash when giving focus to a non-GLFWwindow surface

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot 2017-12-19 19:06:40 +01:00 committed by linkmauve
parent 552e40a4be
commit 5b65b9b860
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wl_init.c
View File

@ -54,6 +54,8 @@ static void pointerHandleEnter(void* data,
return; return;
_GLFWwindow* window = wl_surface_get_user_data(surface); _GLFWwindow* window = wl_surface_get_user_data(surface);
if (!window)
return;
_glfw.wl.pointerSerial = serial; _glfw.wl.pointerSerial = serial;
_glfw.wl.pointerFocus = window; _glfw.wl.pointerFocus = window;
@ -280,6 +282,8 @@ static void keyboardHandleEnter(void* data,
return; return;
_GLFWwindow* window = wl_surface_get_user_data(surface); _GLFWwindow* window = wl_surface_get_user_data(surface);
if (!window)
return;
_glfw.wl.keyboardFocus = window; _glfw.wl.keyboardFocus = window;
_glfwInputWindowFocus(window, GLFW_TRUE); _glfwInputWindowFocus(window, GLFW_TRUE);