check status of Window * before grabbing _NET_WM_NAME property (possible fix for #14)

woodruffw · woodruffw · commit f0915aa21625 · 2015-02-17T11:49:52.000-05:00
diff --git a/src/plat/linux/detect.c b/src/plat/linux/detect.c
@@ -652,7 +652,7 @@ void detect_wm(void)
 			0, KB, false,	XA_WINDOW, &actual_type, &actual_format, &nitems,
 			&bytes, (unsigned char **) &wm_check_window)))
 		{
-			if (!(XGetWindowProperty(disp, *wm_check_window,
+			if (wm_check_window && !(XGetWindowProperty(disp, *wm_check_window,
 				XInternAtom(disp, "_NET_WM_NAME", true), 0, KB, false,
 				XInternAtom(disp, "UTF8_STRING", true),	&actual_type,
 				&actual_format, &nitems, &bytes, (unsigned char **) &wm_name)))

Original file line number	Diff line number	Diff line change
`@@ -652,7 +652,7 @@ void detect_wm(void)`
`652`	`652`	`0, KB, false, XA_WINDOW, &actual_type, &actual_format, &nitems,`
`653`	`653`	`&bytes, (unsigned char **) &wm_check_window)))`
`654`	`654`	`{`
`655`		`- if (!(XGetWindowProperty(disp, *wm_check_window,`
	`655`	`+ if (wm_check_window && !(XGetWindowProperty(disp, *wm_check_window,`
`656`	`656`	`XInternAtom(disp, "_NET_WM_NAME", true), 0, KB, false,`
`657`	`657`	`XInternAtom(disp, "UTF8_STRING", true), &actual_type,`
`658`	`658`	`&actual_format, &nitems, &bytes, (unsigned char **) &wm_name)))`