Author: titmuss
Date: Mon Feb 4 15:35:05 2008
New Revision: 1801
URL: http://svn.slimdevices.com?rev=1801&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1791): bklaas | 2008-02-04 21:46:43 +0000
Bug: 6901
Description: trying to fix issue with NowPlaying not being functional under
certain circumstances
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Feb 4 15:35:05 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1790
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1791
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=1801&root=Jive&r1=1800&r2=1801&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua Mon
Feb 4 15:35:05 2008
@@ -257,7 +257,7 @@
function _isThisPlayer(self, player)
- if not self.player then
+ if not self.player and not self.player:getId() then
local discovery =
appletManager:getAppletInstance("SlimDiscovery")
self.player = discovery:getCurrentPlayer()
end
@@ -822,7 +822,7 @@
{
padding = { 0, 0, 0, 25 },
text = {
- padding = { 8, 0, 8, 25 },
+ padding = { 0, 0, 0, 25 },
}
}
)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
