diff options
author | Zandr Martin <zandrmartin@users.noreply.github.com> | 2016-06-11 09:33:24 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-11 09:33:24 -0500 |
commit | 66caee645cc276bf747ae492df02c08d978ee90d (patch) | |
tree | 034b3d95fd283d934462df8740430cc53786f105 /sway/config.c | |
parent | clean up pid/workspace stuff (diff) | |
parent | Many improvements to man pages (diff) | |
download | sway-66caee645cc276bf747ae492df02c08d978ee90d.tar.gz sway-66caee645cc276bf747ae492df02c08d978ee90d.tar.zst sway-66caee645cc276bf747ae492df02c08d978ee90d.zip |
Merge branch 'master' into assign-command
Diffstat (limited to 'sway/config.c')
-rw-r--r-- | sway/config.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/config.c b/sway/config.c index 321534ed..07b1f2f7 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -403,6 +403,11 @@ static bool load_include_config(const char *path, const char *parent_dir, struct | |||
403 | char *real_path = realpath(full_path, NULL); | 403 | char *real_path = realpath(full_path, NULL); |
404 | free(full_path); | 404 | free(full_path); |
405 | 405 | ||
406 | if (real_path == NULL) { | ||
407 | sway_log(L_DEBUG, "%s not found.", path); | ||
408 | return false; | ||
409 | } | ||
410 | |||
406 | // check if config has already been included | 411 | // check if config has already been included |
407 | int j; | 412 | int j; |
408 | for (j = 0; j < config->config_chain->length; ++j) { | 413 | for (j = 0; j < config->config_chain->length; ++j) { |