DESKTOP_SEL: discard hashes within MONITOR_SEL:

Fixes baskerville#1267.
q3cpma · Mar 22, 2021 · fb35765 · fb35765
1 parent 7012d99
commit fb35765
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/query.c b/src/query.c
@@ -698,6 +698,12 @@ int desktop_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
 	desc = desc_copy;
 
 	char *hash = strrchr(desc, '#');
+	char *colon = strrchr(desc, ':');
+
+	/* Discard hashes inside a MONITOR_SEL, e.g. `primary#next:focused` */
+	if (hash != NULL && colon != NULL && hash < colon) {
+		hash = NULL;
+	}
 
 	if (hash != NULL) {
 		*hash = '\0';
@@ -712,7 +718,6 @@ int desktop_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
 	}
 
 	desktop_select_t sel = make_desktop_select();
-	char *colon = strrchr(desc, ':');
 
 	if (!parse_desktop_modifiers(colon != NULL ? colon : desc, &sel)) {
 		free(desc_copy);