sway

commit 855368b67e8b7d0b1dd035bde7f9119d37b35e5d
parent cdfc7194943d29fc6c099e320c78af8cd47d3e9b
Author: Connor E <38229097+c-edw@users.noreply.github.com>
Date:   Wed,  6 Feb 2019 14:01:40 +0000

Return false if config could not be loaded.

Diffstat:
M
sway/config.c
 | 
8
+++++++-

1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/sway/config.c b/sway/config.c
@@ -574,7 +574,13 @@ bool load_include_configs(const char *path, struct sway_config *config,
 	char **w = p.we_wordv;
 	size_t i;
 	for (i = 0; i < p.we_wordc; ++i) {
-		load_include_config(w[i], parent_dir, config, swaynag);
+		bool found = load_include_config(w[i], parent_dir, config, swaynag);
+		if (!found) {
+			wordfree(&p);
+			free(parent_path);
+			free(wd);
+			return false;
+		}
 	}
 	free(parent_path);
 	wordfree(&p);