diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-07-16 22:25:28 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-07-18 19:15:56 -0400 |
| commit | 6c9aa2a2672903a468ab565d787c1afc3c4de725 (patch) | |
| tree | 512fdb07d13da15484d7aaed523dc5530a607dc5 /swaybar/tray/dbus.c | |
| parent | 9a4558b62b196c777899088cad1cb0d46aa934d2 (diff) | |
Merge pull request #1283 from 4e554c4c/memory_leak0.14-rc5
Fix memory leaks in swaybar tray
Diffstat (limited to 'swaybar/tray/dbus.c')
| -rw-r--r-- | swaybar/tray/dbus.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/swaybar/tray/dbus.c b/swaybar/tray/dbus.c index 2a8cefc7..f562baeb 100644 --- a/swaybar/tray/dbus.c +++ b/swaybar/tray/dbus.c @@ -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); } } |