Author: agrundman
Date: Tue Sep 20 14:20:18 2011
New Revision: 9535
URL: http://svn.slimdevices.com/jive?rev=9535&view=rev
Log:
r79776@andy-imac (orig r9533): ayoung | 2011-09-20 10:50:27 -0400
Re-add the isPoweron check to the relevant condition.
Modified:
7.6/branches/usb-audio/ (props changed)
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: 7.6/branches/usb-audio/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Sep 20 14:20:18 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:9408
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9511
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9533
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/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=9535&r1=9534&r2=9535&view=diff
==============================================================================
---
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Tue Sep 20 14:20:18 2011
@@ -3664,7 +3664,7 @@
-- Bug 17529: Only push to NowPlaying if the playlist now has size, and
an emptyStep window currently exists
-- in other words, we're moving from an empty playlist (special case NP
window that says "Nothing") to a non-empty playlist
-- so in this case only, we need to explicitly push to NowPlaying and
remove the emptyStep window
- elseif playlistSize and emptyStep and emptyStep.window then
+ elseif _player:isPowerOn() and playlistSize and emptyStep and
emptyStep.window then
-- only move into NowPlaying if screensaver is allowed
if Window:getTopNonTransientWindow():canActivateScreensaver()
then
_goNowPlaying(nil, true)
_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
