mirror of
https://github.com/glfw/glfw.git
synced 2024-11-10 00:51:47 +00:00
Cleaned up fix for #234.
XFree may not be passed NULL. An invalid window handle will cause _glfwGetWindowProperty to not return 1.
This commit is contained in:
parent
135ee0d93f
commit
b3c461bd7e
@ -355,6 +355,7 @@ static void detectEWMH(void)
|
||||
XA_WINDOW,
|
||||
(unsigned char**) &windowFromRoot) != 1)
|
||||
{
|
||||
if (windowFromRoot)
|
||||
XFree(windowFromRoot);
|
||||
return;
|
||||
}
|
||||
@ -369,13 +370,12 @@ static void detectEWMH(void)
|
||||
(unsigned char**) &windowFromChild) != 1)
|
||||
{
|
||||
XFree(windowFromRoot);
|
||||
if (windowFromChild)
|
||||
XFree(windowFromChild);
|
||||
return;
|
||||
}
|
||||
|
||||
_glfwReleaseXErrorHandler();
|
||||
if (_glfw.x11.errorCode != Success)
|
||||
return;
|
||||
|
||||
// It should be the ID of that same child window
|
||||
if (*windowFromRoot != *windowFromChild)
|
||||
|
Loading…
Reference in New Issue
Block a user