Merge changes from upstream

e65de2941c
This commit is contained in:
Kovid Goyal 2020-05-01 14:57:55 +05:30
parent 4754f42e51
commit 2fc6f3b542
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

6
glfw/x11_window.c vendored
View File

@ -1416,8 +1416,10 @@ static void processEvent(XEvent *event)
&xpos, &ypos,
&dummy);
_glfwReleaseErrorHandlerX11();
if (_glfw.x11.errorCode != Success)
_glfwInputError(GLFW_PLATFORM_ERROR, "X11: Failed to trnslate configurenotiy co-ords for reparented window");
if (_glfw.x11.errorCode != Success) {
_glfwInputError(GLFW_PLATFORM_ERROR, "X11: Failed to translate ConfigureNotiy co-ords for reparented window");
return;
}
}
if (xpos != window->x11.xpos || ypos != window->x11.ypos)