diff options
author | emersion <contact@emersion.fr> | 2018-10-08 15:08:33 +0200 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2018-10-08 15:08:33 +0200 |
commit | c988b03d85e4c747194a682a40ab1b1e309a2fbe (patch) | |
tree | d790dee3ea65f825f16e89453196c74c4512583b /sway/commands/swaybg_command.c | |
parent | Merge pull request #2791 from RyanDwyer/status-command-optional (diff) | |
download | sway-c988b03d85e4c747194a682a40ab1b1e309a2fbe.tar.gz sway-c988b03d85e4c747194a682a40ab1b1e309a2fbe.tar.zst sway-c988b03d85e4c747194a682a40ab1b1e309a2fbe.zip |
Allow swaybg to be disabled
Diffstat (limited to 'sway/commands/swaybg_command.c')
-rw-r--r-- | sway/commands/swaybg_command.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sway/commands/swaybg_command.c b/sway/commands/swaybg_command.c index 36f7fdcd..b184b193 100644 --- a/sway/commands/swaybg_command.c +++ b/sway/commands/swaybg_command.c | |||
@@ -9,12 +9,17 @@ struct cmd_results *cmd_swaybg_command(int argc, char **argv) { | |||
9 | return error; | 9 | return error; |
10 | } | 10 | } |
11 | 11 | ||
12 | if (config->swaybg_command) { | 12 | free(config->swaybg_command); |
13 | free(config->swaybg_command); | 13 | config->swaybg_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 swaybg command: %s", | ||
19 | config->swaybg_command); | ||
20 | } else { | ||
21 | free(new_command); | ||
14 | } | 22 | } |
15 | config->swaybg_command = join_args(argv, argc); | ||
16 | wlr_log(WLR_DEBUG, "Using custom swaybg command: %s", | ||
17 | config->swaybg_command); | ||
18 | 23 | ||
19 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
20 | } | 25 | } |