forked from enlightenment/enlightenment
add some null checks before monitor deletion to account for people still affected by the frenchman's laziness
SVN revision: 80757
This commit is contained in:
parent
ddbf106d6e
commit
15df42143e
|
@ -964,7 +964,7 @@ _e_wid_fprev_cb_del(E_Widget_Data *wd, int type __UNUSED__, Eio_Monitor_Event *e
|
||||||
{
|
{
|
||||||
if (wd->monitor != ev->monitor) return ECORE_CALLBACK_RENEW;
|
if (wd->monitor != ev->monitor) return ECORE_CALLBACK_RENEW;
|
||||||
_e_wid_fprev_clear_widgets(wd);
|
_e_wid_fprev_clear_widgets(wd);
|
||||||
eio_monitor_del(wd->monitor);
|
if (wd->monitor) eio_monitor_del(wd->monitor);
|
||||||
wd->monitor = NULL;
|
wd->monitor = NULL;
|
||||||
E_FREE_LIST(wd->handlers, ecore_event_handler_del);
|
E_FREE_LIST(wd->handlers, ecore_event_handler_del);
|
||||||
return ECORE_CALLBACK_RENEW;
|
return ECORE_CALLBACK_RENEW;
|
||||||
|
|
|
@ -629,7 +629,7 @@ _box_button_free(Nav_Item *ni)
|
||||||
e_box_unpack(ni->o);
|
e_box_unpack(ni->o);
|
||||||
evas_object_del(ni->o);
|
evas_object_del(ni->o);
|
||||||
E_FREE_LIST(ni->handlers, ecore_event_handler_del);
|
E_FREE_LIST(ni->handlers, ecore_event_handler_del);
|
||||||
eio_monitor_del(ni->monitor);
|
if (ni->monitor) eio_monitor_del(ni->monitor);
|
||||||
eina_stringshare_del(ni->path);
|
eina_stringshare_del(ni->path);
|
||||||
free(ni);
|
free(ni);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue