Merge branch 'master' into assign-command

This commit is contained in:
Zandr Martin 2016-06-11 09:33:24 -05:00 committed by GitHub
commit 66caee645c
7 changed files with 113 additions and 64 deletions

View file

@ -403,6 +403,11 @@ static bool load_include_config(const char *path, const char *parent_dir, struct
char *real_path = realpath(full_path, NULL);
free(full_path);
if (real_path == NULL) {
sway_log(L_DEBUG, "%s not found.", path);
return false;
}
// check if config has already been included
int j;
for (j = 0; j < config->config_chain->length; ++j) {