Author: titmuss
Date: Wed Jul  2 06:04:26 2008
New Revision: 2654

URL: http://svn.slimdevices.com?rev=2654&root=Jive&view=rev
Log:
Bug: N/A
Description:
When SC is turned off, sometimes the home menu items can remain locked. You can 
press left 
to cancel the request, but the Controller could appear locked to some users. 
This change 
makes sure that the menu is unlocked.


Modified:
    
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua

Modified: 
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL: 
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=2654&root=Jive&r1=2653&r2=2654&view=diff
==============================================================================
--- 
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
 (original)
+++ 
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
 Wed Jul  2 06:04:26 2008
@@ -91,6 +91,8 @@
 local _curStep = false
 local _statusStep = false
 local _emptyStep = false
+
+local _lockedItem = false
 
 -- Our main menu/handlers
 local _playerMenus = {}
@@ -982,7 +984,8 @@
                                                                        
_curStep = step
                                                                else
                                                                        from, 
qty = step.db:missing(step.menu and step.menu:isAccelerated())
-       
+
+                                                                       
_lockedItem = item
                                                                        
jiveMain:lockItem(item,
                                                                                
  function()
                                                                                
  step.cancelled = true
@@ -991,6 +994,7 @@
                                                                        
step.loaded = function()
                                                                                
      jiveMain:unlockItem(item)
                
+                                                                               
      _lockedItem = false
                                                                                
      _curStep = step
                                                                                
      step.window:show()
                                                                              
end
@@ -2400,6 +2404,12 @@
        _server = false
        _string = false
 
+       -- make sure any home menu itema are unlocked
+       if _lockedItem then
+               jiveMain:unlockItem(_lockedItem)
+               _lockedItem = false
+       end
+
        -- walk down our path and close...
        local step = _curStep
 

_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins

Reply via email to