aboutsummaryrefslogtreecommitdiffstats
path: root/swaybar/bar.c
diff options
context:
space:
mode:
authorLibravatar Ian Fan <ianfan0@gmail.com>2018-09-24 18:42:25 +0100
committerLibravatar Ian Fan <ianfan0@gmail.com>2018-09-28 13:48:59 +0100
commit312d009f656e86401cda1c6198b929e4cbd85d2f (patch)
tree4ac796d0f654d29416a1906e70b05d79e1a0641a /swaybar/bar.c
parentMerge pull request #2722 from RyanDwyer/workspace-configs (diff)
downloadsway-312d009f656e86401cda1c6198b929e4cbd85d2f.tar.gz
sway-312d009f656e86401cda1c6198b929e4cbd85d2f.tar.zst
sway-312d009f656e86401cda1c6198b929e4cbd85d2f.zip
swaybar: fail if bar id is invalid
Diffstat (limited to 'swaybar/bar.c')
-rw-r--r--swaybar/bar.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/swaybar/bar.c b/swaybar/bar.c
index ab307fd4..809416dd 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -478,14 +478,16 @@ static void render_all_frames(struct swaybar *bar) {
478 } 478 }
479} 479}
480 480
481void bar_setup(struct swaybar *bar, 481bool bar_setup(struct swaybar *bar,
482 const char *socket_path, const char *bar_id) { 482 const char *socket_path, const char *bar_id) {
483 bar_init(bar); 483 bar_init(bar);
484 init_event_loop(); 484 init_event_loop();
485 485
486 bar->ipc_socketfd = ipc_open_socket(socket_path); 486 bar->ipc_socketfd = ipc_open_socket(socket_path);
487 bar->ipc_event_socketfd = ipc_open_socket(socket_path); 487 bar->ipc_event_socketfd = ipc_open_socket(socket_path);
488 ipc_initialize(bar, bar_id); 488 if (!ipc_initialize(bar, bar_id)) {
489 return false;
490 }
489 if (bar->config->status_command) { 491 if (bar->config->status_command) {
490 bar->status = status_line_init(bar->config->status_command); 492 bar->status = status_line_init(bar->config->status_command);
491 } 493 }
@@ -526,6 +528,7 @@ void bar_setup(struct swaybar *bar,
526 528
527 ipc_get_workspaces(bar); 529 ipc_get_workspaces(bar);
528 render_all_frames(bar); 530 render_all_frames(bar);
531 return true;
529} 532}
530 533
531static void display_in(int fd, short mask, void *data) { 534static void display_in(int fd, short mask, void *data) {