mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-04-04 19:38:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reload command now matches i3's implementation

Browse source
This commit is contained in:
Geoffrey Casper 2020-07-04 12:28:19 -04:00 • committed by Brian Ashworth
parent e5954f321f
commit ea3ba203cc
4 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sway/commands/reload.c
View file

@ -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.");
}