From b63b2d548eb9afd1432a62f9f52b0d7ecc25e228 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Thu, 18 Dec 2014 10:13:27 -0500 Subject: [PATCH] call e_powersave_init Before we call e_screensaver_init because the init of e_screensaver sets up an event handler for the powersave_update event (which would be 0 unless powersave is init first). Thanks to dt9 for the report ! ;) Signed-off-by: Chris Michael --- src/bin/e_main.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/bin/e_main.c b/src/bin/e_main.c index 230c28fc4..f8eb64d12 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -625,6 +625,16 @@ main(int argc, char **argv) e_desk_init(); e_exehist_init(); + if (e_config->show_splash) + e_init_status_set(_("Setup Powersave Modes")); + TS("E_Powersave Init"); + if (!e_powersave_init()) + { + e_error_message_show(_("Enlightenment cannot set up its powersave modes.\n")); + _e_main_shutdown(-1); + } + TS("E_Powersave Init Done"); + _e_main_shutdown_push(e_powersave_shutdown); if (e_config->show_splash) e_init_status_set(_("Setup Screensaver")); @@ -725,17 +735,6 @@ main(int argc, char **argv) TS("E_Dpms Init Done"); _e_main_shutdown_push(e_dpms_shutdown); - if (e_config->show_splash) - e_init_status_set(_("Setup Powersave Modes")); - TS("E_Powersave Init"); - if (!e_powersave_init()) - { - e_error_message_show(_("Enlightenment cannot set up its powersave modes.\n")); - _e_main_shutdown(-1); - } - TS("E_Powersave Init Done"); - _e_main_shutdown_push(e_powersave_shutdown); - if (e_config->show_splash) e_init_status_set(_("Setup Desklock")); TS("E_Desklock Init");