englebass pushed a commit to branch master.
commit 79fba3fa9a0424c6441896e78633a2521bd4e717
Author: Sebastian Dransfeld <[email protected]>
Date: Fri Mar 1 11:14:58 2013 +0100
Fix hibernate
---
ChangeLog | 4 ++++
src/bin/e_sys.c | 21 ++++++++++-----------
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4b7b913..1bfd409 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c
index 21a91d8..1966717 100644
--- a/src/bin/e_sys.c
+++ b/src/bin/e_sys.c
@@ -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
{
--
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
