diff options
author | Ian Fan <ianfan0@gmail.com> | 2018-07-08 20:34:47 +0100 |
---|---|---|
committer | Ian Fan <ianfan0@gmail.com> | 2018-07-10 12:37:37 +0100 |
commit | 23c1c26c3fedf5470dbee9fe97c2374a48588863 (patch) | |
tree | 751b5569e4e05149c7a7cd7e0d8084be5ff62063 /sway/commands | |
parent | Add get_binding_modes message type to ipc (diff) | |
download | sway-23c1c26c3fedf5470dbee9fe97c2374a48588863.tar.gz sway-23c1c26c3fedf5470dbee9fe97c2374a48588863.tar.zst sway-23c1c26c3fedf5470dbee9fe97c2374a48588863.zip |
Add get_config message type to ipc
Diffstat (limited to 'sway/commands')
-rw-r--r-- | sway/commands/output/background.c | 2 | ||||
-rw-r--r-- | sway/commands/reload.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c index c2c138f8..4ed56c2a 100644 --- a/sway/commands/output/background.c +++ b/sway/commands/output/background.c | |||
@@ -80,7 +80,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) { | |||
80 | if (config->reading && *src != '/') { | 80 | if (config->reading && *src != '/') { |
81 | // src file is inside configuration dir | 81 | // src file is inside configuration dir |
82 | 82 | ||
83 | char *conf = strdup(config->current_config); | 83 | char *conf = strdup(config->current_config_path); |
84 | if (!conf) { | 84 | if (!conf) { |
85 | wlr_log(WLR_ERROR, "Failed to duplicate string"); | 85 | wlr_log(WLR_ERROR, "Failed to duplicate string"); |
86 | free(src); | 86 | free(src); |
diff --git a/sway/commands/reload.c b/sway/commands/reload.c index 9fc213c4..c6715f9c 100644 --- a/sway/commands/reload.c +++ b/sway/commands/reload.c | |||
@@ -7,7 +7,7 @@ struct cmd_results *cmd_reload(int argc, char **argv) { | |||
7 | if ((error = checkarg(argc, "reload", EXPECTED_EQUAL_TO, 0))) { | 7 | if ((error = checkarg(argc, "reload", EXPECTED_EQUAL_TO, 0))) { |
8 | return error; | 8 | return error; |
9 | } | 9 | } |
10 | if (!load_main_config(config->current_config, true)) { | 10 | if (!load_main_config(config->current_config_path, true)) { |
11 | return cmd_results_new(CMD_FAILURE, "reload", "Error(s) reloading config."); | 11 | return cmd_results_new(CMD_FAILURE, "reload", "Error(s) reloading config."); |
12 | } | 12 | } |
13 | 13 | ||