minor tweaks to prevent harmless invalid reads during restarts with windows open
This commit is contained in:
parent
462c2ef4aa
commit
a44b172607
|
@ -827,6 +827,7 @@ _e_comp_free(E_Comp *c)
|
||||||
if (c->screen_job) ecore_job_del(c->screen_job);
|
if (c->screen_job) ecore_job_del(c->screen_job);
|
||||||
if (c->nocomp_delay_timer) ecore_timer_del(c->nocomp_delay_timer);
|
if (c->nocomp_delay_timer) ecore_timer_del(c->nocomp_delay_timer);
|
||||||
if (c->nocomp_override_timer) ecore_timer_del(c->nocomp_override_timer);
|
if (c->nocomp_override_timer) ecore_timer_del(c->nocomp_override_timer);
|
||||||
|
ecore_job_del(c->shape_job);
|
||||||
|
|
||||||
free(c);
|
free(c);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1580,13 +1580,10 @@ _e_main_screens_shutdown(void)
|
||||||
e_exehist_shutdown();
|
e_exehist_shutdown();
|
||||||
e_backlight_shutdown();
|
e_backlight_shutdown();
|
||||||
e_exec_shutdown();
|
e_exec_shutdown();
|
||||||
// ecore_evas closes evas - deletes objs - deletes fm widgets which tries to
|
|
||||||
// ipc to slave to stop monitoring - but ipc has been shut down. dont shut
|
e_desk_shutdown();
|
||||||
// down.
|
e_zone_shutdown();
|
||||||
// e_desk_shutdown();
|
e_manager_shutdown();
|
||||||
// e_zone_shutdown();
|
|
||||||
// e_container_shutdown();
|
|
||||||
// e_manager_shutdown();
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1078,6 +1078,7 @@ _e_shelf_free(E_Shelf *es)
|
||||||
if (!es->dummy)
|
if (!es->dummy)
|
||||||
_e_shelf_bindings_del(es);
|
_e_shelf_bindings_del(es);
|
||||||
|
|
||||||
|
if (!stopping)
|
||||||
e_zone_useful_geometry_dirty(es->zone);
|
e_zone_useful_geometry_dirty(es->zone);
|
||||||
E_FREE_LIST(es->handlers, ecore_event_handler_del);
|
E_FREE_LIST(es->handlers, ecore_event_handler_del);
|
||||||
|
|
||||||
|
|
|
@ -1589,6 +1589,7 @@ _e_zone_object_del_attach(void *o)
|
||||||
E_Event_Zone_Del *ev;
|
E_Event_Zone_Del *ev;
|
||||||
|
|
||||||
zone = o;
|
zone = o;
|
||||||
|
if (stopping) return;
|
||||||
ev = E_NEW(E_Event_Zone_Del, 1);
|
ev = E_NEW(E_Event_Zone_Del, 1);
|
||||||
ev->zone = zone;
|
ev->zone = zone;
|
||||||
e_object_ref(E_OBJECT(ev->zone));
|
e_object_ref(E_OBJECT(ev->zone));
|
||||||
|
|
Loading…
Reference in New Issue