NetActiveWindow: make sure to unfocus previously selected window if moving to another monitor

1 files changed, 4 insertions, 3 deletions

diff --git a/dwm.c b/dwm.c
index cf90f8b..d90b811 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1214,12 +1214,13 @@ clientmessage(XEvent *e)
 		}
 	} else if (cme->message_type == netatom[NetActiveWindow]) {
 		#if FOCUSONNETACTIVE_PATCH
-		if (c->tags & c->mon->tagset[c->mon->seltags]) {
-			selmon = c->mon;
+		if (c->tags & c->mon->tagset[c->mon->seltags])
 			focus(c);
-		} else {
+		else {
 			for (i = 0; i < NUMTAGS && !((1 << i) & c->tags); i++);
 			if (i < NUMTAGS) {
+				if (c != selmon->sel)
+					unfocus(selmon->sel, 0, NULL);
 				selmon = c->mon;
 				if (((1 << i) & TAGMASK) != selmon->tagset[selmon->seltags])
 					view(&((Arg) { .ui = 1 << i }));