mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-26 06:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed uncaught BadWindow in EWMH check.

Browse Source 
Fixes #234.
This commit is contained in:
Camilla Berglund 2014-02-11 15:46:54 +01:00
parent 7f4e947447
commit 69e10b88b0
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -59,6 +59,8 @@ The following dependencies are needed by the examples and test programs:
- [X11] Bugfix: The case of finding no usable CRTCs was not detected - [X11] Bugfix: The case of finding no usable CRTCs was not detected
- [X11] Bugfix: Detection of broken Nvidia RandR gamma support did not verify - [X11] Bugfix: Detection of broken Nvidia RandR gamma support did not verify
that at least one CRTC was present that at least one CRTC was present
- [X11] Bugfix: A stale `_NET_SUPPORTING_WM_CHECK` root window property would
cause an uncaught `BadWindow` error
## Contact ## Contact

6
src/x11_init.c
View File

@ -359,6 +359,8 @@ static void detectEWMH(void)
return; return;
} }
_glfwGrabXErrorHandler();
// It should be the ID of a child window (of the root) // It should be the ID of a child window (of the root)
// Then we look for the same property on the child window // Then we look for the same property on the child window
if (_glfwGetWindowProperty(*windowFromRoot, if (_glfwGetWindowProperty(*windowFromRoot,
@ -371,6 +373,10 @@ static void detectEWMH(void)
return; return;
} }
_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)
{ {