Index: Player.lua
===================================================================
--- Player.lua	(revision 8398)
+++ Player.lua	(working copy)
@@ -409,15 +409,13 @@
 	self.info.isUpgrading = tonumber(playerInfo.player_is_upgrading) == 1
 	self.info.pin = tostring(playerInfo.pin)
 
-	self.lastSeen = Framework:getTicks()
-
 	-- PIN is removed from serverstatus after a player is linked
 	if self.info.pin and not playerInfo.pin then
 		self.info.pin = nil
 	end
 
 	-- Check have we changed SqueezeCenter
-        if self.serverRefreshInProgress or self.slimServer ~= slimServer then
+    if self.serverRefreshInProgress or self.slimServer ~= slimServer or self.lastSeen == 0 then
  		if self.slimServer == slimServer and self.serverRefreshInProgress then
  		        log:info("Same server but serverRefreshInProgress in progress: ", slimServer)
  		end
@@ -449,6 +447,8 @@
 		self.jnt:notify('playerNew', self)
 	end
 
+	self.lastSeen = Framework:getTicks()
+
 	-- Check for player firmware upgrades
 	if oldInfo.needsUpgrade ~= self.info.needsUpgrade or oldInfo.isUpgrading ~= self.info.isUpgrading then
 		self.jnt:notify('playerNeedsUpgrade', self, self:isNeedsUpgrade(), self:isUpgrading())
@@ -615,7 +615,7 @@
 
 	if self == currentPlayer then
 		self.jnt:notify('playerDisconnected', self)
-
+		self.info.connected = false
 		-- dont' delete state if this is the current player
 		return
 	end