summaryrefslogtreecommitdiff
path: root/sway/config.c
diff options
context:
space:
mode:
authorDrew DeVault <[email protected]>2018-07-19 14:09:19 -0700
committerGitHub <[email protected]>2018-07-19 14:09:19 -0700
commit3483f1ea1ac66f261452f4cb4fea5f6b342b41d1 (patch)
treea81ef9a4d873de4a886ee414872b496838a61160 /sway/config.c
parent4154234eee1fa86f3a01d2f47b4fa632dcd73644 (diff)
parentda9c86c608b33d78e25ced5858be579f502efd63 (diff)
Merge branch 'master' into update-wlroots-1148
Diffstat (limited to 'sway/config.c')
-rw-r--r--sway/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/config.c b/sway/config.c
index c620e4c7..00500812 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -649,7 +649,6 @@ bool read_config(FILE *file, struct sway_config *config) {
} else {
res = config_command(expanded);
}
- free(expanded);
switch(res->status) {
case CMD_FAILURE:
case CMD_INVALID:
@@ -660,7 +659,7 @@ bool read_config(FILE *file, struct sway_config *config) {
case CMD_DEFER:
wlr_log(WLR_DEBUG, "Deferring command `%s'", line);
- list_add(config->cmd_queue, strdup(line));
+ list_add(config->cmd_queue, strdup(expanded));
break;
case CMD_BLOCK_COMMANDS:
@@ -693,6 +692,7 @@ bool read_config(FILE *file, struct sway_config *config) {
sizeof(config->handler_context));
default:;
}
+ free(expanded);
free(line);
free_cmd_results(res);
}