diff options
author | Connor E <38229097+c-edw@users.noreply.github.com> | 2019-02-24 04:39:08 +0000 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2019-02-24 00:01:35 -0500 |
commit | d4b1e71b919a52fbad0ba8191259eb4f14dfd1ab (patch) | |
tree | 5933eaa3a951f8b9cae3b63452f9c572b37be7b8 /sway/commands/include.c | |
parent | Fix crash exiting fullscreened floating container (diff) | |
download | sway-d4b1e71b919a52fbad0ba8191259eb4f14dfd1ab.tar.gz sway-d4b1e71b919a52fbad0ba8191259eb4f14dfd1ab.tar.zst sway-d4b1e71b919a52fbad0ba8191259eb4f14dfd1ab.zip |
Make load_include_configs void. Fix some cases where WD would not be restored.
Diffstat (limited to 'sway/commands/include.c')
-rw-r--r-- | sway/commands/include.c | 7 |
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) { | |||
7 | return error; | 7 | return error; |
8 | } | 8 | } |
9 | 9 | ||
10 | if (!load_include_configs(argv[0], config, | 10 | // We don't care if the included config(s) fails to load. |
11 | &config->swaynag_config_errors)) { | 11 | load_include_configs(argv[0], config, &config->swaynag_config_errors); |
12 | return cmd_results_new(CMD_INVALID, | ||
13 | "Failed to include sub configuration file: %s", argv[0]); | ||
14 | } | ||
15 | 12 | ||
16 | return cmd_results_new(CMD_SUCCESS, NULL); | 13 | return cmd_results_new(CMD_SUCCESS, NULL); |
17 | } | 14 | } |