1 files changed, 5 insertions, 3 deletions

diff --git a/swaybar/tray/dbus.c b/swaybar/tray/dbus.c
index 22531aa6..8e719fd9 100644
--- a/swaybar/tray/dbus.c
+++ b/swaybar/tray/dbus.c
@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _XOPEN_SOURCE 700
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -108,7 +108,7 @@ static dbus_bool_t add_timeout(DBusTimeout *timeout, void *_data) {
 
         timer_settime(*timer, 0, &time, NULL);
 
-        dbus_timeout_set_data(timeout, timer, free);
+        dbus_timeout_set_data(timeout, timer, NULL);
 
         sway_log(L_DEBUG, "Adding DBus timeout. Interval: %ds %dms", interval_sec, interval_msec);
         add_timer(*timer, dispatch_timeout, timeout);
@@ -121,6 +121,8 @@ static void remove_timeout(DBusTimeout *timeout, void *_data) {
 
         if (timer) {
                 remove_timer(*timer);
+                timer_delete(*timer);
+                free(timer);
         }
 }
 
@@ -136,7 +138,7 @@ static void dispatch_status(DBusConnection *connection, DBusDispatchStatus new_s
 /* Public functions below */
 
 void dispatch_dbus() {
-        if (!should_dispatch) {
+        if (!should_dispatch || !conn) {
                 return;
         }