aboutsummaryrefslogtreecommitdiffstats
path: root/sway/config.c
diff options
context:
space:
mode:
authorLibravatar Connor E <38229097+c-edw@users.noreply.github.com>2019-02-06 14:01:40 +0000
committerLibravatar emersion <contact@emersion.fr>2019-02-06 18:23:20 +0100
commit855368b67e8b7d0b1dd035bde7f9119d37b35e5d (patch)
tree63ca700cc7ab623b61a0346a567f5a58f6b58de9 /sway/config.c
parentMerge pull request #3597 from dnkl/fix-inverted-bitmask-check-in-ipc-has-even... (diff)
downloadsway-855368b67e8b7d0b1dd035bde7f9119d37b35e5d.tar.gz
sway-855368b67e8b7d0b1dd035bde7f9119d37b35e5d.tar.zst
sway-855368b67e8b7d0b1dd035bde7f9119d37b35e5d.zip
Return false if config could not be loaded.
Diffstat (limited to 'sway/config.c')
-rw-r--r--sway/config.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sway/config.c b/sway/config.c
index 18fb69d9..455d20cd 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -574,7 +574,13 @@ bool load_include_configs(const char *path, struct sway_config *config,
574 char **w = p.we_wordv; 574 char **w = p.we_wordv;
575 size_t i; 575 size_t i;
576 for (i = 0; i < p.we_wordc; ++i) { 576 for (i = 0; i < p.we_wordc; ++i) {
577 load_include_config(w[i], parent_dir, config, swaynag); 577 bool found = load_include_config(w[i], parent_dir, config, swaynag);
578 if (!found) {
579 wordfree(&p);
580 free(parent_path);
581 free(wd);
582 return false;
583 }
578 } 584 }
579 free(parent_path); 585 free(parent_path);
580 wordfree(&p); 586 wordfree(&p);