diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-10-15 13:10:58 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-10-15 13:13:22 -0400 |
| commit | dc872be2dfeb3decc477db415f854d164d5a46cd (patch) | |
| tree | a446a885c638cda8f0bd2777a025cd0ecb6509ed | |
| parent | 56ff9ead0353368d664c7badabbe0d03c204fdf9 (diff) | |
| download | enlightenment-dc872be2dfeb3decc477db415f854d164d5a46cd.tar.gz | |
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
| -rw-r--r-- | src/modules/systray/e_mod_notifier_watcher.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/systray/e_mod_notifier_watcher.c b/src/modules/systray/e_mod_notifier_watcher.c index 0bde9498b6..d3c25fadd1 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)) { |