Author: titmuss
Date: Tue Jan 29 05:08:40 2008
New Revision: 1670
URL: http://svn.slimdevices.com?rev=1670&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1667): bklaas | 2008-01-28 23:42:10 +0000
Bug: 5705
Description: allow Now Playing to enter an empty playlist menu that says "Off"
when the player is off
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Jan 29 05:08:40 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1666
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1667
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua?rev=1670&root=Jive&r1=1669&r2=1670&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua Tue
Jan 29 05:08:40 2008
@@ -358,7 +358,7 @@
function _updatePlaylist(self, enabled, nr, count, ws)
if not ws then ws = self[windowStyle] end
- if enabled == true and count > 1 then
+ if enabled == true and count and count > 1 then
nr = nr + 1
ws.titleGroup:setWidgetValue("playlist",
self:string("SCREENSAVER_NOWPLAYING_OF", nr, count))
else
Modified:
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=1670&root=Jive&r1=1669&r2=1670&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua Tue
Jan 29 05:08:40 2008
@@ -1674,7 +1674,7 @@
_statusStep.window:setTitle(_string("SLIMBROWSER_NOW_PLAYING"))
end
- if playlistSize <= 1 then
+ if playlistSize == nil or (playlistSize and playlistSize <= 1)
then
_statusStep.menu["_lastSelectedIndex"] = 1
_statusStep.menu["_lastSelectedOffset"] = 1
_statusStep.menu.selected = 1
@@ -1761,7 +1761,11 @@
local step = _statusStep
step.db:updateStatus(playerStatus)
- step.menu:setSelectedIndex(step.db:playlistIndex())
+ if step.db:playlistIndex() then
+ step.menu:setSelectedIndex(step.db:playlistIndex())
+ else
+ step.menu:setSelectedIndex(1)
+ end
step.menu:reLayout()
-- does the playlist need loading?
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
