Merge branch 'master' into next

Conflicts: src/commands.c
2015-03-07 15:57:41 +01:00 · 2015-03-07 15:57:41 +01:00 · 0148dc6fd3
parent 6226400dfd 5fb99ad9f7
commit 0148dc6fd3
1 changed files with 1 additions and 1 deletions
--- a/src/commands.c
+++ b/src/commands.c
@ -909,7 +909,7 @@ void cmd_append_layout(I3_CMD, char *path) {
    LOG("JSON content = %d\n", content);
    if (content == JSON_CONTENT_UNKNOWN) {
        ELOG("Could not determine the contents of \"%s\", not loading.\n", path);
-        ysuccess(false);
+        yerror("Could not determine the contents of \"%s\".", path);
        free(path);
        return;
    }