X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=01e8d1f5dd8931715d7ca61bf17a26df55289f42;hp=a0ab126352d724bc882d3dcdb9ed6d8761eefe50;hb=3150a8a1beef1884365210e0e4d18b2599269a78;hpb=b3c5f5435ad8bdf69cd5b0cc23c8b3217c39ba5c

diff --git a/dwm.c b/dwm.c
index a0ab126..01e8d1f 100644
--- a/dwm.c
+++ b/dwm.c
@@ -827,13 +827,14 @@ enternotify(XEvent *e) {
 	if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
 		return;
 	c = wintoclient(ev->window);
-	if((m = wintomon(ev->window)) && m != selmon) {
+	m = c ? c->mon : wintomon(ev->window);
+	if(m != selmon) {
 		unfocus(selmon->sel, True);
 		selmon = m;
 	}
-	else if(c == selmon->sel || c == NULL)
+	else if(!c || c == selmon->sel)
 		return;
-	focus((wintoclient(ev->window)));
+	focus(c);
 }
 
 void