Index: squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
===================================================================
--- squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua	(revision 9122)
+++ squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua	(working copy)
@@ -28,6 +28,7 @@
 local json                   = require("json")
                              
 local Applet                 = require("jive.Applet")
+local System                 = require("jive.System")
 local Player                 = require("jive.slim.Player")
 local SlimServer             = require("jive.slim.SlimServer")
 local Framework              = require("jive.ui.Framework")
@@ -786,7 +787,8 @@
 	-- debug.dump(request)
 
 	-- there's an existing network or server error, so trap this request and push to a diags troubleshooting window
-	if _networkError then
+	-- Bug 15662: don't push a diags window when tinySC is available on the system and running
+	if _networkError and not ( System:hasTinySC() and appletManager:callService("isBuiltInSCRunning") ) then
 		log:warn('_networkError is not false, therefore push on an error window for diags')
 		local currentStep = _getCurrentStep()
 		_diagWindow = appletManager:callService("networkTroubleshootingMenu", _networkError)
Index: squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua
===================================================================
--- squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua	(revision 9122)
+++ squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua	(working copy)
@@ -718,7 +718,8 @@
 					local currentPlayer = appletManager:callService("getCurrentPlayer")
 
 					-- if we know there is a network error condition, push on a diags window immediately
-					if self.networkError then
+					-- Bug 16552: don't push to diags window if player has tinySC and tinySC is running
+					if self.networkError and not ( System:hasTinySC() and appletManager:callService("isBuiltInSCRunning") ) then
 						log:warn('Network reported as not OK')
 						self.diagWindow = appletManager:callService("networkTroubleshootingMenu", self.networkError)
 						-- make sure we got a window generated to confirm we can leave this method
Index: squeezeplay/share/jive/System.lua
===================================================================
--- squeezeplay/share/jive/System.lua	(revision 9122)
+++ squeezeplay/share/jive/System.lua	(working copy)
@@ -69,6 +69,7 @@
 	["usb"] = 1,
 	["batteryCapable"] = 1,
 	["hasDigitalOut"] = 1,
+	["hasTinySC"] = 1,
 }
 
 local _capabilities = {} -- of form string, 1 so
@@ -86,6 +87,10 @@
 	_capabilities = capabilities
 end
 
+function hasTinySC(self)
+	return _capabilities["hasTinySC"] ~= nil
+end
+
 function hasDigitalOut(self)
 	return _capabilities["hasDigitalOut"] ~= nil
 end
Index: squeezeplay_fab4/share/applets/SqueezeboxFab4/SqueezeboxFab4Applet.lua
===================================================================
--- squeezeplay_fab4/share/applets/SqueezeboxFab4/SqueezeboxFab4Applet.lua	(revision 9122)
+++ squeezeplay_fab4/share/applets/SqueezeboxFab4/SqueezeboxFab4Applet.lua	(working copy)
@@ -123,6 +123,7 @@
 		["usb"] = 1,
 		["sdcard"] = 1,
 		["hasDigitalOut"] = 1,
+		["hasTinySC"] = 1,
 	})
 
 	--account for fab4 touchpad hardware issue: the bottom pixels aren't reported correctly