summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2017-08-12 08:18:30 -0400
committerLibravatar GitHub <noreply@github.com>2017-08-12 08:18:30 -0400
commit1b9ee85bc526f5bdbf0a7f786e88ffdbceaadd8f (patch)
treea645a658b708e507abba06e9db853ed6f32b8c3f
parentRe-enable implicit fallthrough warnings (diff)
parentPrevent crash if DBus connection is NULL (diff)
downloadsway-1b9ee85bc526f5bdbf0a7f786e88ffdbceaadd8f.tar.gz
sway-1b9ee85bc526f5bdbf0a7f786e88ffdbceaadd8f.tar.zst
sway-1b9ee85bc526f5bdbf0a7f786e88ffdbceaadd8f.zip
Merge pull request #1316 from 4e554c4c/swaybar_crash
Prevent crash if DBus connection is NULL
-rw-r--r--swaybar/tray/dbus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/swaybar/tray/dbus.c b/swaybar/tray/dbus.c
index f562baeb..8e719fd9 100644
--- a/swaybar/tray/dbus.c
+++ b/swaybar/tray/dbus.c
@@ -138,7 +138,7 @@ static void dispatch_status(DBusConnection *connection, DBusDispatchStatus new_s
138/* Public functions below */ 138/* Public functions below */
139 139
140void dispatch_dbus() { 140void dispatch_dbus() {
141 if (!should_dispatch) { 141 if (!should_dispatch || !conn) {
142 return; 142 return;
143 } 143 }
144 144