Use player info when in a game, and CSS info when not

Author: bkacjios

source/melee.lua

@@ -540,13 +540,11 @@ end
 function melee.getPlayer(port)
 	if not memory.player then return end
 
-	if not melee.isInGame() then
-		if melee.isSinglePlayerGame() and port == memory.menu.player_one_port + 1 then
-			-- Single player games in CSS screen always use PORT 1 character info no matter what port is controlling the menus
-			return memory.player[1].select
-		else
-			return memory.player[port].select
-		end
+	if melee.isSinglePlayerGame() and port == memory.menu.player_one_port + 1 then
+		-- Single player games in CSS screen always use PORT 1 character info no matter what port is controlling the menus
+		return memory.player[1].select
+	else if not melee.isInGame() then
+		return memory.player[port].select
 	end
 
 	return memory.player[port]