diff options
| author | Geoffrey Casper <gcasper42@gmail.com> | 2020-07-04 12:28:19 -0400 |
|---|---|---|
| committer | Brian Ashworth <bosrsf04@gmail.com> | 2020-07-07 17:15:57 -0400 |
| commit | ea3ba203cc65671d9bf9da5ddbc698b18ed7685c (patch) | |
| tree | 22ab793cfe435091addd12ba0a940a3975451a14 /sway/commands | |
| parent | e5954f321f76c9337efaf9c5f66140bfba2bae77 (diff) | |
| download | sway-ea3ba203cc65671d9bf9da5ddbc698b18ed7685c.tar.xz | |
Reload command now matches i3's implementation
Diffstat (limited to 'sway/commands')
| -rw-r--r-- | sway/commands/reload.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sway/commands/reload.c b/sway/commands/reload.c index 19ec065c..3c994d54 100644 --- a/sway/commands/reload.c +++ b/sway/commands/reload.c @@ -22,7 +22,12 @@ static void do_reload(void *data) { list_add(bar_ids, strdup(bar->id)); } - if (!load_main_config(config->current_config_path, true, false)) { + const char *path = NULL; + if (config->user_config_path) { + path = config->current_config_path; + } + + if (!load_main_config(path, true, false)) { sway_log(SWAY_ERROR, "Error(s) reloading config"); list_free_items_and_destroy(bar_ids); return; @@ -55,7 +60,12 @@ struct cmd_results *cmd_reload(int argc, char **argv) { return error; } - if (!load_main_config(config->current_config_path, true, true)) { + const char *path = NULL; + if (config->user_config_path) { + path = config->current_config_path; + } + + if (!load_main_config(path, true, true)) { return cmd_results_new(CMD_FAILURE, "Error(s) reloading config."); } |