mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 09:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up fix for #234.

Browse Source 
XFree may not be passed NULL.  An invalid window handle will cause
_glfwGetWindowProperty to not return 1.
This commit is contained in:
Camilla Berglund 2014-02-12 13:02:46 +01:00
parent 135ee0d93f
commit b3c461bd7e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/x11_init.c
View File

@ -355,6 +355,7 @@ static void detectEWMH(void)
XA_WINDOW, XA_WINDOW,
(unsigned char**) &windowFromRoot) != 1) (unsigned char**) &windowFromRoot) != 1)
{ {
if (windowFromRoot)
XFree(windowFromRoot); XFree(windowFromRoot);
return; return;
} }
@ -369,13 +370,12 @@ static void detectEWMH(void)
(unsigned char**) &windowFromChild) != 1) (unsigned char**) &windowFromChild) != 1)
{ {
XFree(windowFromRoot); XFree(windowFromRoot);
if (windowFromChild)
XFree(windowFromChild); XFree(windowFromChild);
return; return;
} }
_glfwReleaseXErrorHandler(); _glfwReleaseXErrorHandler();
if (_glfw.x11.errorCode != Success)
return;
// It should be the ID of that same child window // It should be the ID of that same child window
if (*windowFromRoot != *windowFromChild) if (*windowFromRoot != *windowFromChild)