diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2018-10-08 09:56:34 -0400 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2018-10-08 09:59:38 -0400 |
commit | 09c3c33081a8b8c941cbc1eeab0e5a70e54d04ff (patch) | |
tree | 9f657329f7775cd764b60326a419d369eae8a605 /sway/commands/swaynag_command.c | |
parent | Merge pull request #2793 from emersion/disable-swaybg (diff) | |
download | sway-09c3c33081a8b8c941cbc1eeab0e5a70e54d04ff.tar.gz sway-09c3c33081a8b8c941cbc1eeab0e5a70e54d04ff.tar.zst sway-09c3c33081a8b8c941cbc1eeab0e5a70e54d04ff.zip |
Allow swaynag to be disabled
Diffstat (limited to 'sway/commands/swaynag_command.c')
-rw-r--r-- | sway/commands/swaynag_command.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sway/commands/swaynag_command.c b/sway/commands/swaynag_command.c index c57a80a6..6c86f1a7 100644 --- a/sway/commands/swaynag_command.c +++ b/sway/commands/swaynag_command.c | |||
@@ -9,12 +9,17 @@ struct cmd_results *cmd_swaynag_command(int argc, char **argv) { | |||
9 | return error; | 9 | return error; |
10 | } | 10 | } |
11 | 11 | ||
12 | if (config->swaynag_command) { | 12 | free(config->swaynag_command); |
13 | free(config->swaynag_command); | 13 | config->swaynag_command = NULL; |
14 | |||
15 | char *new_command = join_args(argv, argc); | ||
16 | if (strcmp(new_command, "-") != 0) { | ||
17 | config->swaybg_command = new_command; | ||
18 | wlr_log(WLR_DEBUG, "Using custom swaynag command: %s", | ||
19 | config->swaynag_command); | ||
20 | } else { | ||
21 | free(new_command); | ||
14 | } | 22 | } |
15 | config->swaynag_command = join_args(argv, argc); | ||
16 | wlr_log(WLR_DEBUG, "Using custom swaynag command: %s", | ||
17 | config->swaynag_command); | ||
18 | 23 | ||
19 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
20 | } | 25 | } |