Author: bklaas
Date: Thu Mar 17 13:52:11 2011
New Revision: 9383
URL: http://svn.slimdevices.com/jive?rev=9383&view=rev
Log:
r49768@DaddyMac (orig r9382): bklaas | 2011-03-17 15:51:19 -0500
Don't drill into a nil object for myMusicNode
Modified:
7.6/branches/new-setup/ (props changed)
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua
Propchange: 7.6/branches/new-setup/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Mar 17 13:52:11 2011
@@ -15,7 +15,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/private-branches/7.5.3-rc:9282
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9376
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9378
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9382
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua?rev=9383&r1=9382&r2=9383&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua
Thu Mar 17 13:52:11 2011
@@ -957,6 +957,11 @@
function _updateMyMusicTitle(self, serverName)
local myMusicNode = jiveMain:getMenuTable()["_myMusic"]
+ -- it is possible on some branches for there to be no myMusicNode
+ if not myMusicNode then
+ return
+ end
+
if not myMusicNode.originalNodeText then
myMusicNode.originalNodeText = myMusicNode.text
--todo: this doesn't handle on-the-fly language change well
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
