Index: src/squeezeplay/share/jive/net/Comet.lua
===================================================================
--- src/squeezeplay/share/jive/net/Comet.lua	(revision 9187)
+++ src/squeezeplay/share/jive/net/Comet.lua	(working copy)
@@ -188,7 +188,7 @@
 	self.chttp:setPriority(Task.PRIORITY_HIGH)
 	self.rhttp:setPriority(Task.PRIORITY_HIGH)
 
-	if oldState == CONNECTING or self.state == CONNECTED then
+	if oldState == CONNECTING or oldState == CONNECTED then
 		-- Reconnect
 		_handshake(self)
 	end
@@ -478,9 +478,13 @@
 
 	-- Send immediately unless we're batching queries
 	if self.state ~= CONNECTED or self.batch ~= 0 then
-		if self.state ~= CONNECTED then
-			self.jnt:notify('cometDisconnected', self, self.idleTimeoutTriggered)
-			self.idleTimeoutTriggered = nil
+	
+		-- SlimServer.lua may think that we are reconnecting but actually we are not
+		-- because we got reconnect advice of 'none' previously. But this request is likely user-initiated
+		-- so we shuould try again nuw.
+		
+		if self.state == UNCONNECTED or self.state == UNCONNECTING then
+			_reconnect(self)
 		end
 
 		return id