Merge branch 'master' into next

2011-09-11 22:52:44 +01:00
parent a41bfba47a 67cf46fa62
commit 717ae819c5
2 changed files with 41 additions and 0 deletions
--- a/src/cfgparse.y
+++ b/src/cfgparse.y
@ -729,6 +729,10 @@ bindsym:
 for_window:
    TOK_FOR_WINDOW match command
    {
+        if (match_is_empty(&current_match)) {
+            ELOG("Match is empty, ignoring this for_window statement\n");
+            break;
+        }
        printf("\t should execute command %s for the criteria mentioned above\n", $3);
        Assignment *assignment = scalloc(sizeof(Assignment));
        assignment->type = A_COMMAND;