Author: ayoung
Date: Fri Feb 26 02:50:09 2010
New Revision: 8583
URL: http://svn.slimdevices.com/jive?rev=8583&view=rev
Log:
Fixed bug 15633: cannot switch to SD card content without network
SlimMenusApplet: if the server has just connected and we do not have our menus
yet then the request must have been lost in a transient connection interruption,
so reissue the request for our menus.
The fact that we get a transient connection loss if probably another bug but we
still need to be able to handle the resulting state.
In the case that we get such a transient connection loss then we will end up in
the Home
menu instead of the My Music menu after changing music source.
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua?rev=8583&r1=8582&r2=8583&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua
Fri Feb 26 02:50:09 2010
@@ -173,6 +173,17 @@
if (server:isSqueezeNetwork() or server == lastSc) and server ~=
_server then
self:_fetchServerMenu(server)
+ end
+
+ -- Bug 15633: if the server has just connected and we do not have our
menus
+ -- yet then the request must have been lost in a transient connection
interruption,
+ -- so reissue the request.
+ if self.waitingForPlayerMenuStatus
+ and _server and server == _server
+ and _player and _player:isConnected()
+ then
+ --Get initial menus from connected server.
+ _server:userRequest(_sinkSetServerMenuChunk(self, server, true)
, _player:getId(), { 'menu', 0, 100, "direct:1" })
end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
