aboutsummaryrefslogtreecommitdiff
path: root/sway/commands
diff options
context:
space:
mode:
authorConnor E <38229097+c-edw@users.noreply.github.com>2019-02-24 04:39:08 +0000
committerBrian Ashworth <bosrsf04@gmail.com>2019-02-24 00:01:35 -0500
commitd4b1e71b919a52fbad0ba8191259eb4f14dfd1ab (patch)
tree5933eaa3a951f8b9cae3b63452f9c572b37be7b8 /sway/commands
parent713883f04cf1f2a2bafb389562a79d98b87909e9 (diff)
Make load_include_configs void. Fix some cases where WD would not be restored.
Diffstat (limited to 'sway/commands')
-rw-r--r--sway/commands/include.c7
1 files changed, 2 insertions, 5 deletions
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);
}