Author: mherger
Date: Thu Feb 25 22:52:09 2010
New Revision: 8580
URL: http://svn.slimdevices.com/jive?rev=8580&view=rev
Log:
Fixed Bug: 15777
Description: a new firmware update notification screen was being pushed on top
of the download screen while fab4 was waiting for services to be stopped. Once
the update is started set a flag, and don't push any new window as long as this
flag is set. Remove flag on failure on manual exit of the screen.
Modified:
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
Modified:
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua?rev=8580&r1=8579&r2=8580&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
Thu Feb 25 22:52:09 2010
@@ -318,6 +318,12 @@
--service method
function firmwareUpgrade(self, server, optionalForScDiscoveryMode)
+
+ if self.updating then
+ log:warn("Update is already running... please don't disturb!")
+ return
+ end
+
local upgrades, force, disallowScreensaver
if not server then
-- in "SC Discovery Mode"
@@ -500,6 +506,8 @@
if not _checkBattery() then
return self:_chargeBattery()
end
+
+ self.updating = true
self.popup = Popup("update_popup")
@@ -570,6 +578,7 @@
-- unblock keys
Framework:removeListener(self.upgradeListener)
self.upgradeListener = nil
+ self.updating = false
-- reconnect to server
appletManager:callService("connectPlayer")
@@ -605,6 +614,10 @@
self:tieAndShowWindow(window)
end
+function free(self)
+ self.updating = false
+ return true
+end
--[[
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
