mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-10-29 05:40:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

swaybar: fail if bar id is invalid

Browse source
This commit is contained in:
Ian Fan 2018-09-24 18:42:25 +01:00
parent 02df1e2b1b
commit 312d009f65
5 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
swaybar/bar.c
View file

@ -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) {