diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2018-10-09 13:41:12 -0400 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2018-10-13 08:00:01 -0400 |
commit | 00745d6280d36b57e661f9de7af84c93fde60efa (patch) | |
tree | 2518c93327baa4df99c25f68754adf77c8429364 /sway/config/bar.c | |
parent | Merge pull request #2828 from RyanDwyer/fix-locked-map-crash (diff) | |
download | sway-00745d6280d36b57e661f9de7af84c93fde60efa.tar.gz sway-00745d6280d36b57e661f9de7af84c93fde60efa.tar.zst sway-00745d6280d36b57e661f9de7af84c93fde60efa.zip |
Fix bar subcommand handler structs and selection
Diffstat (limited to 'sway/config/bar.c')
-rw-r--r-- | sway/config/bar.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sway/config/bar.c b/sway/config/bar.c index c6899f57..5726e95b 100644 --- a/sway/config/bar.c +++ b/sway/config/bar.c | |||
@@ -226,13 +226,17 @@ static void invoke_swaybar(struct bar_config *bar) { | |||
226 | close(filedes[1]); | 226 | close(filedes[1]); |
227 | } | 227 | } |
228 | 228 | ||
229 | void load_swaybar(struct bar_config *bar) { | ||
230 | if (bar->pid != 0) { | ||
231 | terminate_swaybar(bar->pid); | ||
232 | } | ||
233 | wlr_log(WLR_DEBUG, "Invoking swaybar for bar id '%s'", bar->id); | ||
234 | invoke_swaybar(bar); | ||
235 | } | ||
236 | |||
229 | void load_swaybars(void) { | 237 | void load_swaybars(void) { |
230 | for (int i = 0; i < config->bars->length; ++i) { | 238 | for (int i = 0; i < config->bars->length; ++i) { |
231 | struct bar_config *bar = config->bars->items[i]; | 239 | struct bar_config *bar = config->bars->items[i]; |
232 | if (bar->pid != 0) { | 240 | load_swaybar(bar); |
233 | terminate_swaybar(bar->pid); | ||
234 | } | ||
235 | wlr_log(WLR_DEBUG, "Invoking swaybar for bar id '%s'", bar->id); | ||
236 | invoke_swaybar(bar); | ||
237 | } | 241 | } |
238 | } | 242 | } |