summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-06-22 08:14:23 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-06-22 08:16:46 +0100
commit21200cb2f7695993d1736039079f4719a9669eb4 (patch)
treedfda941aaa74360c88f9eda35d8f85d9a798af09 /src
parent2c9405b92fb47c1faa341538bc0a7ac1aa46e4f6 (diff)
e init - stop listening to zone changes once init has been hidden
Diffstat (limited to 'src')
-rw-r--r--src/bin/e_init.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/bin/e_init.c b/src/bin/e_init.c
index b55637fc4..2d1abfeaa 100644
--- a/src/bin/e_init.c
+++ b/src/bin/e_init.c
@@ -111,6 +111,7 @@ _e_init_zone_change_job(void *data EINA_UNUSED)
111 Eina_List *l, *ll; 111 Eina_List *l, *ll;
112 112
113 _e_init_update_job = NULL; 113 _e_init_update_job = NULL;
114 if (done > 0) return;
114 // pass 1 - delete splash objects for zones that have gone OR 115 // pass 1 - delete splash objects for zones that have gone OR
115 // update the zone obj to have the right clip and geometry 116 // update the zone obj to have the right clip and geometry
116 EINA_LIST_FOREACH_SAFE(splash_objs, l, ll, o) 117 EINA_LIST_FOREACH_SAFE(splash_objs, l, ll, o)
@@ -181,10 +182,13 @@ e_init_shutdown(void)
181 /* if not killed, kill init */ 182 /* if not killed, kill init */
182 ecore_event_handler_del(_e_init_event_zone_add); 183 ecore_event_handler_del(_e_init_event_zone_add);
183 ecore_event_handler_del(_e_init_event_zone_del); 184 ecore_event_handler_del(_e_init_event_zone_del);
184 ecore_event_handler_del(_e_init_event_zone_move_resize); 185 if (_e_init_event_zone_move_resize)
186 {
187 ecore_event_handler_del(_e_init_event_zone_move_resize);
188 _e_init_event_zone_move_resize = NULL;
189 }
185 _e_init_event_zone_add = NULL; 190 _e_init_event_zone_add = NULL;
186 _e_init_event_zone_del = NULL; 191 _e_init_event_zone_del = NULL;
187 _e_init_event_zone_move_resize = NULL;
188 e_init_hide(); 192 e_init_hide();
189 return 1; 193 return 1;
190} 194}
@@ -218,6 +222,11 @@ e_init_show(void)
218E_API void 222E_API void
219e_init_hide(void) 223e_init_hide(void)
220{ 224{
225 if (_e_init_event_zone_move_resize)
226 {
227 ecore_event_handler_del(_e_init_event_zone_move_resize);
228 _e_init_event_zone_move_resize = NULL;
229 }
221 E_FREE_LIST(splash_objs, evas_object_del); 230 E_FREE_LIST(splash_objs, evas_object_del);
222 e_comp_shape_queue(); 231 e_comp_shape_queue();
223 _e_init_object = NULL; 232 _e_init_object = NULL;