NODE_SEL: Discard hashes inside a DESKTOP_SEL

diff --git a/src/query.c b/src/query.c
index 61da3a9a3acd0b7b4fc397c688572197be70caaf..f679593a572cc34330d30aa6484251c84b5d5834 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -483,6 +483,18 @@ int node_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
        desc = desc_copy;
 
        char *hash = strrchr(desc, '#');
+       char *path = strrchr(desc, '@');
+       char *colon = strrchr(desc, ':');
+
+       /* Discard hashes inside a DESKTOP_SEL */
+       if (hash != NULL && colon != NULL && path != NULL &&
+           path < hash && hash < colon) {
+               if (path > desc && *(path - 1) == '#') {
+                       hash = path - 1;
+               } else {
+                       hash = NULL;
+               }
+       }
 
        if (hash != NULL) {
                *hash = '\0';
@@ -497,7 +509,6 @@ int node_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
        }
 
        node_select_t sel = make_node_select();
-       char *colon = strrchr(desc, ':');
 
        if (!parse_node_modifiers(colon != NULL ? colon : desc, &sel)) {
                free(desc_copy);