aboutsummaryrefslogtreecommitdiffstats
path: root/sway/config.c
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2019-02-07 21:22:53 -0500
committerLibravatar GitHub <noreply@github.com>2019-02-07 21:22:53 -0500
commit82d7a70b03b43e8e417aeb84803ef04f452bce13 (patch)
tree8628735f74dd5cd446745a9a937c3fd5c40845c6 /sway/config.c
parentRevert "Restore CWD if returning early." (diff)
downloadsway-82d7a70b03b43e8e417aeb84803ef04f452bce13.tar.gz
sway-82d7a70b03b43e8e417aeb84803ef04f452bce13.tar.zst
sway-82d7a70b03b43e8e417aeb84803ef04f452bce13.zip
Revert "Return false if config could not be loaded."
Diffstat (limited to 'sway/config.c')
-rw-r--r--sway/config.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sway/config.c b/sway/config.c
index 18df2add..ae8d11e3 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -573,13 +573,7 @@ bool load_include_configs(const char *path, struct sway_config *config,
573 char **w = p.we_wordv; 573 char **w = p.we_wordv;
574 size_t i; 574 size_t i;
575 for (i = 0; i < p.we_wordc; ++i) { 575 for (i = 0; i < p.we_wordc; ++i) {
576 bool found = load_include_config(w[i], parent_dir, config, swaynag); 576 load_include_config(w[i], parent_dir, config, swaynag);
577 if (!found) {
578 wordfree(&p);
579 free(parent_path);
580 free(wd);
581 return false;
582 }
583 } 577 }
584 free(parent_path); 578 free(parent_path);
585 wordfree(&p); 579 wordfree(&p);