r2674 - trunk/src/target/OM-2007.2/daemons/neod/src

[mickey at sita.openmoko.org]

Author: mickey
Date: 2007-08-09 21:03:09 +0200 (Thu, 09 Aug 2007)
New Revision: 2674

Modified:
   trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
neod: fix bug that prevented stopping PM


Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c	2007-08-09 18:47:32 UTC (rev 2673)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c	2007-08-09 19:03:09 UTC (rev 2674)
@@ -528,9 +528,6 @@
 
 void neod_buttonactions_powersave_reset()
 {
-    if ( pm_value == NONE )
-        return;
-
     g_debug( "mainmenu powersave reset" );
     if ( powersave_timer1 != -1 )
         g_source_remove( powersave_timer1 );
@@ -539,6 +536,9 @@
     if ( powersave_timer3 != -1 )
         g_source_remove( powersave_timer3 );
 
+    if ( pm_value == NONE )
+        return;
+
     //TODO load this from preferences
     powersave_timer1 = g_timeout_add( 10 * 1000, (GSourceFunc) neod_buttonactions_powersave_timeout1, (gpointer)1 );
     powersave_timer2 = g_timeout_add( 20 * 1000, (GSourceFunc) neod_buttonactions_powersave_timeout2, (gpointer)1 );