discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=e1035aef815dfd8b8bacd09499bf516097a89bee
commit e1035aef815dfd8b8bacd09499bf516097a89bee
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Thu Feb 25 15:05:24 2016 -0500
Revert "e comp: fix crashes on exit/restart when e_comp is NULL"
This reverts commit 26a7ba3a58d573121b1dfbbca9f72988ecd8a891.
this can only occur if something forces an event flush during shutdown.
in this case, whatever is triggering the event flush is a bug, not the
dereferencing of a pointer which is guaranteed to exist for the normal
lifetime of the process
---
src/bin/e_comp.c | 1 -
src/bin/e_comp_x.c | 8 --------
2 files changed, 9 deletions(-)
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 5232d35..4bce85d 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -1574,7 +1574,6 @@ e_comp_block_window_del(void)
E_API E_Comp *
e_comp_find_by_window(Ecore_Window win)
{
- if (!e_comp) return NULL;
if ((e_comp->win == win) || (e_comp->ee_win == win) || (e_comp->root ==
win)) return e_comp;
return NULL;
}
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 209baff..ea5dec3 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -1238,7 +1238,6 @@ _e_comp_x_show_request(void *data EINA_UNUSED, int type
EINA_UNUSED, Ecore_X_Eve
E_Client *ec;
//INF("X SHOW REQ: %u", ev->win);
- if (!e_comp) return ECORE_CALLBACK_RENEW;
ec = _e_comp_x_client_find_by_window(ev->win);
if (e_comp_ignore_win_find(ev->win) ||
(ec && (ec->ignored || ec->override)) ||
@@ -2211,7 +2210,6 @@ _e_comp_x_mapping_change(void *data EINA_UNUSED, int type
EINA_UNUSED, Ecore_X_E
const Eina_List *l;
E_Client *ec;
- if (!e_comp) return ECORE_CALLBACK_RENEW;
if (_e_comp_x_mapping_change_disabled) return ECORE_CALLBACK_RENEW;
e_comp_canvas_keys_ungrab();
EINA_LIST_FOREACH(e_comp->clients, l, ec)
@@ -2243,7 +2241,6 @@ _e_comp_x_mouse_in(void *data EINA_UNUSED, int type
EINA_UNUSED, Ecore_X_Event_M
{
E_Client *ec;
- if (!e_comp) return ECORE_CALLBACK_RENEW;
if (e_comp->comp_type != E_PIXMAP_TYPE_X) return ECORE_CALLBACK_RENEW;
ec = _e_comp_x_client_find_by_window(ev->win);
if (!ec) return ECORE_CALLBACK_RENEW;
@@ -2272,7 +2269,6 @@ _e_comp_x_mouse_out(void *data EINA_UNUSED, int type
EINA_UNUSED, Ecore_X_Event_
{
E_Client *ec;
- if (!e_comp) return ECORE_CALLBACK_RENEW;
if (e_comp->comp_type != E_PIXMAP_TYPE_X) return ECORE_CALLBACK_RENEW;
if ((ev->mode == ECORE_X_EVENT_MODE_UNGRAB) &&
(ev->detail == ECORE_X_EVENT_DETAIL_INFERIOR))
@@ -2296,7 +2292,6 @@ _e_comp_x_mouse_wheel(void *d EINA_UNUSED, int t
EINA_UNUSED, Ecore_Event_Mouse_
E_Client *ec;
E_Binding_Event_Wheel ev2;
- if (!e_comp) return ECORE_CALLBACK_RENEW;
if (e_comp->comp_type != E_PIXMAP_TYPE_X) return ECORE_CALLBACK_RENEW;
//if (action_input_win)
//ec = action_border;
@@ -2320,7 +2315,6 @@ _e_comp_x_mouse_up(void *d EINA_UNUSED, int t
EINA_UNUSED, Ecore_Event_Mouse_But
E_Client *ec;
E_Binding_Event_Mouse_Button ev2;
- if (!e_comp) return ECORE_CALLBACK_RENEW;
if (e_comp->comp_type != E_PIXMAP_TYPE_X) return ECORE_CALLBACK_RENEW;
//if (action_input_win)
//ec = action_border;
@@ -2349,7 +2343,6 @@ _e_comp_x_mouse_down(void *d EINA_UNUSED, int t
EINA_UNUSED, Ecore_Event_Mouse_B
E_Client *ec;
E_Binding_Event_Mouse_Button ev2;
- if (!e_comp) return ECORE_CALLBACK_RENEW;
if (e_comp->comp_type != E_PIXMAP_TYPE_X) return ECORE_CALLBACK_RENEW;
if (e_client_action_get()) return ECORE_CALLBACK_RENEW; //block extra mouse
buttons during action
//if (action_input_win)
@@ -2372,7 +2365,6 @@ _e_comp_x_mouse_move(void *d EINA_UNUSED, int t
EINA_UNUSED, Ecore_Event_Mouse_M
{
E_Client *ec;
- if (!e_comp) return ECORE_CALLBACK_RENEW;
if (e_comp->comp_type != E_PIXMAP_TYPE_X) return ECORE_CALLBACK_RENEW;
ec = e_client_action_get();
if (!ec)
--
