From 00745d6280d36b57e661f9de7af84c93fde60efa Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Tue, 9 Oct 2018 13:41:12 -0400 Subject: Fix bar subcommand handler structs and selection --- sway/config/bar.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'sway/config/bar.c') 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) { close(filedes[1]); } +void load_swaybar(struct bar_config *bar) { + if (bar->pid != 0) { + terminate_swaybar(bar->pid); + } + wlr_log(WLR_DEBUG, "Invoking swaybar for bar id '%s'", bar->id); + invoke_swaybar(bar); +} + void load_swaybars(void) { for (int i = 0; i < config->bars->length; ++i) { struct bar_config *bar = config->bars->items[i]; - if (bar->pid != 0) { - terminate_swaybar(bar->pid); - } - wlr_log(WLR_DEBUG, "Invoking swaybar for bar id '%s'", bar->id); - invoke_swaybar(bar); + load_swaybar(bar); } } -- cgit v1.2.3-54-g00ecf