From 312d009f656e86401cda1c6198b929e4cbd85d2f Mon Sep 17 00:00:00 2001 From: Ian Fan Date: Mon, 24 Sep 2018 18:42:25 +0100 Subject: swaybar: fail if bar id is invalid --- swaybar/bar.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'swaybar/bar.c') 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) { -- cgit v1.2.3-54-g00ecf