Merge branch 'master' into fly

1 files changed, 2 insertions, 1 deletions

diff --git a/dwm.c b/dwm.c
index 1ec34f0..1c3140e 100644
--- a/dwm.c
+++ b/dwm.c
@@ -871,7 +871,8 @@ getatomprop(Client *c, Atom prop)
 
 	if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
 		&da, &di, &dl, &dl, &p) == Success && p) {
-		atom = *(Atom *)p;
+		if (dl > 0)
+			atom = *(Atom *)p;
 		XFree(p);
 	}
 	return atom;