styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix crash in syscon when you press pr 2x in a row quickly to shutdown 

not pretty but a fix... for now
This commit is contained in:
Carsten Haitzler 2017-03-02 21:12:11 +09:00
parent e3faaf865e
commit 7557486ab3
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/syscon/e_syscon.c
View File

@ -80,8 +80,8 @@ e_syscon_show(E_Zone *zone, const char *defact)
return 0;
}
if (!e_comp_grab_input(1, 1)) return 0;
if (e_desklock_state_get()) return 0;
if (!e_comp_grab_input(1, 1)) return 0;
evas = e_comp->evas;
evas_event_freeze(evas);
@ -96,6 +96,13 @@ e_syscon_show(E_Zone *zone, const char *defact)
_cb_signal_syscon, NULL);
popup = e_comp_object_util_add(o_bg, E_COMP_OBJECT_TYPE_POPUP);
if (!popup)
{
evas_object_del(o_bg);
evas_event_thaw(evas);
e_comp_ungrab_input(1, 1);
return 0;
}
evas_object_data_set(popup, "zone", zone);
evas_object_layer_set(popup, E_LAYER_POPUP);
e_comp_object_util_autoclose(popup, _cb_del, _cb_key_down, NULL);
@ -110,6 +117,14 @@ e_syscon_show(E_Zone *zone, const char *defact)
// home | close | kill
o = e_flowlayout_add(evas);
if (!popup)
{
evas_object_del(o_bg);
evas_object_del(o);
evas_event_thaw(evas);
e_comp_ungrab_input(1, 1);
return 0;
}
e_comp_object_util_del_list_append(popup, o);
o_flow_main = o;
e_flowlayout_orientation_set(o, 1);