aboutsummaryrefslogtreecommitdiff
path: root/sway/commands
diff options
context:
space:
mode:
authorRyan Dwyer <RyanDwyer@users.noreply.github.com>2018-07-10 22:05:33 +1000
committerGitHub <noreply@github.com>2018-07-10 22:05:33 +1000
commit8afe68f92063ff6db061f721868f601b2fc20191 (patch)
tree751b5569e4e05149c7a7cd7e0d8084be5ff62063 /sway/commands
parentc1bb73f8652f367ee7b7b82f5fc13aff51145358 (diff)
parent23c1c26c3fedf5470dbee9fe97c2374a48588863 (diff)
downloadsway-8afe68f92063ff6db061f721868f601b2fc20191.tar.xz
Merge pull request #2232 from ianyfan/ipc
Add some missing ipc message types from i3
Diffstat (limited to 'sway/commands')
-rw-r--r--sway/commands/output/background.c2
-rw-r--r--sway/commands/reload.c2
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) {
if (config->reading && *src != '/') {
// src file is inside configuration dir
- char *conf = strdup(config->current_config);
+ char *conf = strdup(config->current_config_path);
if (!conf) {
wlr_log(WLR_ERROR, "Failed to duplicate string");
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) {
if ((error = checkarg(argc, "reload", EXPECTED_EQUAL_TO, 0))) {
return error;
}
- if (!load_main_config(config->current_config, true)) {
+ if (!load_main_config(config->current_config_path, true)) {
return cmd_results_new(CMD_FAILURE, "reload", "Error(s) reloading config.");
}