[Jive-Checkins] r8913 - /7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua

[fmueller]

Author: fmueller
Date: Thu Jul  1 01:52:02 2010
New Revision: 8913

URL: http://svn.slimdevices.com/jive?rev=8913&view=rev
Log:
Bug: 16331 
Description: Alan's patch to make _updatePower() more robust.

Modified:
    
7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua

Modified: 
7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua?rev=8913&r1=8912&r2=8913&view=diff
==============================================================================
--- 
7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua
 (original)
+++ 
7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua
 Thu Jul  1 01:52:02 2010
@@ -748,7 +748,11 @@
 function _updatePower(self)
        local isLowBattery = false
        local chargerState = sysReadNumber(self, "charger_state")
-       local batteryState
+       local batteryState = false
+
+       if chargerState == nil then
+               return
+       end
 
        if chargerState == 1 then
                -- no battery is installed, we must be on ac!
@@ -790,13 +794,16 @@
        end
 
        -- wake up on ac power changes
-       if batteryState ~= self.batteryState then
+       if batteryState and batteryState ~= self.batteryState then
                self:wakeup()
-                if batteryState == "ac" then                                   
                                         
-                        iconbar.iconBattery:playSound("DOCKING")               
             
-                end                                                            
                           
-       end
-       self.batteryState = batteryState
+               if batteryState == "ac" then                                    
                                        
+                       iconbar.iconBattery:playSound("DOCKING")                
            
+               end                                                             
                          
+       end
+
+       if batteryState then
+               self.batteryState = batteryState
+       end
 
        self:_lowBattery(isLowBattery or self.testLowBattery)
 end

_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/mailman/listinfo/jive-checkins