diff options
Diffstat (limited to 'swaybar')
-rw-r--r-- | swaybar/bar.c | 6 | ||||
-rw-r--r-- | swaybar/status_line.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/swaybar/bar.c b/swaybar/bar.c index 8e89c9a8..be290c18 100644 --- a/swaybar/bar.c +++ b/swaybar/bar.c | |||
@@ -647,7 +647,7 @@ static void status_in(int fd, short mask, void *data) { | |||
647 | if (mask & (POLLHUP | POLLERR)) { | 647 | if (mask & (POLLHUP | POLLERR)) { |
648 | status_error(bar->status, "[error reading from status command]"); | 648 | status_error(bar->status, "[error reading from status command]"); |
649 | set_bar_dirty(bar); | 649 | set_bar_dirty(bar); |
650 | loop_remove_event(bar->eventloop, bar->status_event); | 650 | loop_remove_fd(bar->eventloop, fd); |
651 | } else if (status_handle_readable(bar->status)) { | 651 | } else if (status_handle_readable(bar->status)) { |
652 | set_bar_dirty(bar); | 652 | set_bar_dirty(bar); |
653 | } | 653 | } |
@@ -658,8 +658,8 @@ void bar_run(struct swaybar *bar) { | |||
658 | display_in, bar); | 658 | display_in, bar); |
659 | loop_add_fd(bar->eventloop, bar->ipc_event_socketfd, POLLIN, ipc_in, bar); | 659 | loop_add_fd(bar->eventloop, bar->ipc_event_socketfd, POLLIN, ipc_in, bar); |
660 | if (bar->status) { | 660 | if (bar->status) { |
661 | bar->status_event = loop_add_fd( | 661 | loop_add_fd(bar->eventloop, bar->status->read_fd, POLLIN, |
662 | bar->eventloop, bar->status->read_fd, POLLIN, status_in, bar); | 662 | status_in, bar); |
663 | } | 663 | } |
664 | while (1) { | 664 | while (1) { |
665 | wl_display_flush(bar->display); | 665 | wl_display_flush(bar->display); |
diff --git a/swaybar/status_line.c b/swaybar/status_line.c index 3f7a386f..65d6c052 100644 --- a/swaybar/status_line.c +++ b/swaybar/status_line.c | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | static void status_line_close_fds(struct status_line *status) { | 17 | static void status_line_close_fds(struct status_line *status) { |
18 | if (status->read_fd != -1) { | 18 | if (status->read_fd != -1) { |
19 | loop_remove_event(status->bar->eventloop, status->bar->status_event); | 19 | loop_remove_fd(status->bar->eventloop, status->read_fd); |
20 | close(status->read_fd); | 20 | close(status->read_fd); |
21 | status->read_fd = -1; | 21 | status->read_fd = -1; |
22 | } | 22 | } |