summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <m.blumenkran@samsung.com>2013-06-19 07:09:43 +0100
committerMike Blumenkrantz <m.blumenkran@samsung.com>2013-06-19 07:09:43 +0100
commit6d9c4c0b4c501ec0b25f94554ce5a76d225d2e6a (patch)
tree7aa7a07b8a47dab8130c2f78431fff56e8eb2c23 /src
parentfa8e976540c6a3d42158102ca7e42b26e1da2e6e (diff)
add some safety checks for borders without execs
Diffstat (limited to 'src')
-rw-r--r--src/modules/ibar/e_mod_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 0ff9b8d91..287d4d674 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -139,6 +139,7 @@ Config *ibar_config = NULL;
139static inline const char * 139static inline const char *
140_desktop_name_get(const Efreet_Desktop *desktop) 140_desktop_name_get(const Efreet_Desktop *desktop)
141{ 141{
142 if (!desktop) return NULL;
142 return desktop->orig_path ?: desktop->name; 143 return desktop->orig_path ?: desktop->name;
143} 144}
144 145
@@ -2138,6 +2139,7 @@ _ibar_cb_bd_prop(void *d EINA_UNUSED, int t EINA_UNUSED, E_Event_Border_Property
2138 Eina_List *l; 2139 Eina_List *l;
2139 Eina_Bool skip; 2140 Eina_Bool skip;
2140 2141
2142 if ((!ev->border->exe_inst) || (!ev->border->exe_inst->desktop)) return ECORE_CALLBACK_RENEW;
2141 skip = ev->border->client.netwm.state.skip_taskbar; 2143 skip = ev->border->client.netwm.state.skip_taskbar;
2142 EINA_LIST_FOREACH(ibars, l, b) 2144 EINA_LIST_FOREACH(ibars, l, b)
2143 { 2145 {