Resolved #12230 - MP game with invalid preview cannot be joined

This commit is contained in:
yairm210
2024-09-18 14:11:45 +03:00
parent 51bbe4f961
commit b722a62454

View File

@ -385,10 +385,13 @@ class MultiplayerScreen : PickerScreen() {
selectedGame = multiplayerGame selectedGame = multiplayerGame
for (button in gameSpecificButtons) button.enable() for (button in gameSpecificButtons) button.enable()
if (multiplayerGame.preview != null) { if (multiplayerGame.preview != null) {
copyGameIdButton.enable() copyGameIdButton.enable()
rightSideButton.enable()
} else { } else {
copyGameIdButton.disable() copyGameIdButton.disable()
rightSideButton.disable()
} }
resignButton.isEnabled = multiplayerGame.preview?.getCurrentPlayerCiv()?.playerId == game.settings.multiplayer.userId resignButton.isEnabled = multiplayerGame.preview?.getCurrentPlayerCiv()?.playerId == game.settings.multiplayer.userId
@ -407,9 +410,7 @@ class MultiplayerScreen : PickerScreen() {
&& game.settings.multiplayer.userId in preview.civilizations.map { it.playerId } && game.settings.multiplayer.userId in preview.civilizations.map { it.playerId }
&& preview.gameParameters.minutesUntilSkipTurn <= && preview.gameParameters.minutesUntilSkipTurn <=
Duration.between(Instant.ofEpochMilli(preview.currentTurnStartTime), Instant.now()).toMinutes() Duration.between(Instant.ofEpochMilli(preview.currentTurnStartTime), Instant.now()).toMinutes()
rightSideButton.enable()
descriptionLabel.setText(MultiplayerHelpers.buildDescriptionText(multiplayerGame)) descriptionLabel.setText(MultiplayerHelpers.buildDescriptionText(multiplayerGame))
} }
} }