From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Thu, 15 Oct 2015 17:10:58 +0000 (-0400)
Subject: check systray dbus name existence before attempting to recover session
X-Git-Tag: upstream/0.20.0~137
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc872be2dfeb3decc477db415f854d164d5a46cd;p=platform%2Fupstream%2Fenlightenment.git

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
---

diff --git a/src/modules/systray/e_mod_notifier_watcher.c b/src/modules/systray/e_mod_notifier_watcher.c
index 0bde949..d3c25fa 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))
           {