From dc872be2dfeb3decc477db415f854d164d5a46cd Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 15 Oct 2015 13:10:58 -0400 Subject: [PATCH] check systray dbus name existence before attempting to recover session in the case that a system error occurs the dbus method for returning the session name can fail, leading to a null return CID 1327399 --- src/modules/systray/e_mod_notifier_watcher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/systray/e_mod_notifier_watcher.c b/src/modules/systray/e_mod_notifier_watcher.c index 0bde9498b..d3c25fadd 100644 --- a/src/modules/systray/e_mod_notifier_watcher.c +++ b/src/modules/systray/e_mod_notifier_watcher.c @@ -190,7 +190,7 @@ systray_notifier_dbus_watcher_start(Eldbus_Connection *connection, E_Notifier_Wa dbus = eldbus_connection_unique_name_get(conn); if (systray_ctx_get()->config->items) eina_hash_free_cb_set(systray_ctx_get()->config->items, (Eina_Free_Cb)systray_notifier_item_hash_del); - if (systray_ctx_get()->config->dbus && systray_ctx_get()->config->items) + if (dbus && systray_ctx_get()->config->dbus && systray_ctx_get()->config->items) { if (!strcmp(systray_ctx_get()->config->dbus, dbus)) {