diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2018-07-19 01:39:58 -0400 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2018-07-19 01:39:58 -0400 |
commit | ec652866060a178796d6dbb32bf7f0e2101e56c9 (patch) | |
tree | 7e30314466a00931c26899d28763c809cb790ef2 /sway/config.c | |
parent | Merge pull request #2300 from emersion/override-redirect-updates (diff) | |
download | sway-ec652866060a178796d6dbb32bf7f0e2101e56c9.tar.gz sway-ec652866060a178796d6dbb32bf7f0e2101e56c9.tar.zst sway-ec652866060a178796d6dbb32bf7f0e2101e56c9.zip |
Fix deferred command handling
Diffstat (limited to 'sway/config.c')
-rw-r--r-- | sway/config.c | 4 |
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) { | |||
649 | } else { | 649 | } else { |
650 | res = config_command(expanded); | 650 | res = config_command(expanded); |
651 | } | 651 | } |
652 | free(expanded); | ||
653 | switch(res->status) { | 652 | switch(res->status) { |
654 | case CMD_FAILURE: | 653 | case CMD_FAILURE: |
655 | case CMD_INVALID: | 654 | case CMD_INVALID: |
@@ -660,7 +659,7 @@ bool read_config(FILE *file, struct sway_config *config) { | |||
660 | 659 | ||
661 | case CMD_DEFER: | 660 | case CMD_DEFER: |
662 | wlr_log(WLR_DEBUG, "Deferring command `%s'", line); | 661 | wlr_log(WLR_DEBUG, "Deferring command `%s'", line); |
663 | list_add(config->cmd_queue, strdup(line)); | 662 | list_add(config->cmd_queue, strdup(expanded)); |
664 | break; | 663 | break; |
665 | 664 | ||
666 | case CMD_BLOCK_COMMANDS: | 665 | case CMD_BLOCK_COMMANDS: |
@@ -693,6 +692,7 @@ bool read_config(FILE *file, struct sway_config *config) { | |||
693 | sizeof(config->handler_context)); | 692 | sizeof(config->handler_context)); |
694 | default:; | 693 | default:; |
695 | } | 694 | } |
695 | free(expanded); | ||
696 | free(line); | 696 | free(line); |
697 | free_cmd_results(res); | 697 | free_cmd_results(res); |
698 | } | 698 | } |