pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't crash when no WM is present.

Browse source 
CR: Sam Lantinga.
This commit is contained in:
Sam Lantinga 2013-11-27 10:29:27 -08:00
parent ef7498a5c3
commit aee889c1bd
84 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

0
src/video/SDL_video.c Executable file → Normal file
View file

0
src/video/windows/SDL_windowsevents.c Executable file → Normal file
View file

0
src/video/windows/SDL_windowswindow.c Executable file → Normal file
View file

0
src/video/windows/SDL_windowswindow.h Executable file → Normal file
View file

20
src/video/x11/SDL_x11video.c
View file

@ -440,8 +440,8 @@ X11_CheckWindowManager(_THIS)
Atom _NET_SUPPORTING_WM_CHECK;
int status, real_format;
Atom real_type;
unsigned long items_read, items_left;
unsigned char *propdata;
unsigned long items_read = 0, items_left = 0;
unsigned char *propdata = NULL;
Window wm_window = 0;
#ifdef DEBUG_WINDOW_MANAGER
char *wm_name;
@ -453,11 +453,14 @@ X11_CheckWindowManager(_THIS)
_NET_SUPPORTING_WM_CHECK = X11_XInternAtom(display, "_NET_SUPPORTING_WM_CHECK", False);
status = X11_XGetWindowProperty(display, DefaultRootWindow(display), _NET_SUPPORTING_WM_CHECK, 0L, 1L, False, XA_WINDOW, &real_type, &real_format, &items_read, &items_left, &propdata);
if (status == Success && items_read) {
wm_window = ((Window*)propdata)[0];
}
if (propdata) {
X11_XFree(propdata);
if (status == Success) {
if (items_read) {
wm_window = ((Window*)propdata)[0];
}
if (propdata) {
X11_XFree(propdata);
propdata = NULL;
}
}
if (wm_window) {
@ -465,8 +468,9 @@ X11_CheckWindowManager(_THIS)
if (status != Success || !items_read || wm_window != ((Window*)propdata)[0]) {
wm_window = None;
}
if (propdata) {
if (status == Success && propdata) {
X11_XFree(propdata);
propdata = NULL;
}
}