summaryrefslogtreecommitdiff
path: root/swaybar/bar.c
diff options
context:
space:
mode:
authorIan Fan <[email protected]>2018-09-24 18:42:25 +0100
committerIan Fan <[email protected]>2018-09-28 13:48:59 +0100
commit312d009f656e86401cda1c6198b929e4cbd85d2f (patch)
tree4ac796d0f654d29416a1906e70b05d79e1a0641a /swaybar/bar.c
parent02df1e2b1b4306481f8e1023d99fb568095a89b3 (diff)
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) {
}
}
-void bar_setup(struct swaybar *bar,
+bool bar_setup(struct swaybar *bar,
const char *socket_path, const char *bar_id) {
bar_init(bar);
init_event_loop();
bar->ipc_socketfd = ipc_open_socket(socket_path);
bar->ipc_event_socketfd = ipc_open_socket(socket_path);
- ipc_initialize(bar, bar_id);
+ if (!ipc_initialize(bar, bar_id)) {
+ return false;
+ }
if (bar->config->status_command) {
bar->status = status_line_init(bar->config->status_command);
}
@@ -526,6 +528,7 @@ void bar_setup(struct swaybar *bar,
ipc_get_workspaces(bar);
render_all_frames(bar);
+ return true;
}
static void display_in(int fd, short mask, void *data) {