From 401df9cff48351459d9f733432d0122384827e87 Mon Sep 17 00:00:00 2001
From: Connor E <38229097+c-edw@users.noreply.github.com>
Date: Sun, 24 Feb 2019 04:39:08 +0000
Subject: Make load_include_configs void. Fix some cases where WD would not be
 restored.

---
 sway/commands/include.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'sway/commands')

diff --git a/sway/commands/include.c b/sway/commands/include.c
index d1809856..d4c14c35 100644
--- a/sway/commands/include.c
+++ b/sway/commands/include.c
@@ -7,11 +7,8 @@ struct cmd_results *cmd_include(int argc, char **argv) {
 		return error;
 	}
 
-	if (!load_include_configs(argv[0], config,
-				&config->swaynag_config_errors)) {
-		return cmd_results_new(CMD_INVALID,
-				"Failed to include sub configuration file: %s", argv[0]);
-	}
+	// We don't care if the included config(s) fails to load.
+	load_include_configs(argv[0], config, &config->swaynag_config_errors);
 
 	return cmd_results_new(CMD_SUCCESS, NULL);
 }
-- 
cgit v1.2.3-54-g00ecf