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

Fix hibernate

This commit is contained in:
Sebastian Dransfeld 2013-03-01 11:14:58 +01:00
parent 9187778f32
commit 79fba3fa9a
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-03-01 Sebastian Dransfeld
* Fix sys hibernate by checking raw condition first
2013-02-22 Mike Blumenkrantz
* compositor now allows user changing/remembering of object opacity

21
src/bin/e_sys.c
View File

@ -878,22 +878,21 @@ _e_sys_action_do(E_Sys_Action a, char *param __UNUSED__, Eina_Bool raw)
}
else
{
ecore_event_add(E_EVENT_SYS_HIBERNATE, NULL, NULL, NULL);
if (_e_sys_hibernate_func)
if (raw)
{
_e_sys_hibernate_func();
return 0;
_e_sys_susp_hib_check();
if (e_config->desklock_on_suspend)
e_desklock_show(EINA_TRUE);
_e_sys_begin_time = ecore_time_get();
_e_sys_exe = ecore_exe_run(buf, NULL);
}
else
{
if (raw)
ecore_event_add(E_EVENT_SYS_HIBERNATE, NULL, NULL, NULL);
if (_e_sys_hibernate_func)
{
if (e_config->desklock_on_suspend)
e_desklock_show(EINA_TRUE);
_e_sys_susp_hib_check();
_e_sys_begin_time = ecore_time_get();
_e_sys_exe = ecore_exe_run(buf, NULL);
_e_sys_hibernate_func();
return 0;
}
else
{