From cd7a250c44b28975d9d58d2867974bf4b30e44ad Mon Sep 17 00:00:00 2001 From: Brian Reynolds Date: Thu, 7 Mar 2024 14:49:35 -0500 Subject: [PATCH 1/2] Stronger warning message when joining multiplayer game w/ different version --- vassal-app/src/main/resources/VASSAL/i18n/VASSAL.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vassal-app/src/main/resources/VASSAL/i18n/VASSAL.properties b/vassal-app/src/main/resources/VASSAL/i18n/VASSAL.properties index 6f170f2a31..e22899a986 100644 --- a/vassal-app/src/main/resources/VASSAL/i18n/VASSAL.properties +++ b/vassal-app/src/main/resources/VASSAL/i18n/VASSAL.properties @@ -547,7 +547,7 @@ Chat.join_not_ok=ADVICE: %1$s is not using the same Vassal or Module versions as # Chat.vassal_configuration_error=Possible VASSAL Configuration Error Chat.join_issue=Your VASSAL or Module version does not match that of the owner of room '%1$s'. -Chat.are_you_sure=If you find this causes unpredictable problems, resolve the mismatches noted above. +Chat.are_you_sure=This is likely to cause problems; we strongly recommend resolving the mismatches noted below before playing. Chat.copy=Copy selected log text Chat.save_to_text_file=Save log as text file Chat.save_to_html_file=Save log as html file From 7bf946224efb1a5e5ca01de6732d91659ba839a8 Mon Sep 17 00:00:00 2001 From: Brian Reynolds Date: Thu, 7 Mar 2024 15:00:12 -0500 Subject: [PATCH 2/2] And Don't Come Back Until You Fix It --- vassal-app/src/main/java/VASSAL/chat/ui/JoinRoomAction.java | 5 +++-- vassal-app/src/main/resources/VASSAL/i18n/VASSAL.properties | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/vassal-app/src/main/java/VASSAL/chat/ui/JoinRoomAction.java b/vassal-app/src/main/java/VASSAL/chat/ui/JoinRoomAction.java index 487c6e5f09..f91abb7b92 100644 --- a/vassal-app/src/main/java/VASSAL/chat/ui/JoinRoomAction.java +++ b/vassal-app/src/main/java/VASSAL/chat/ui/JoinRoomAction.java @@ -25,11 +25,11 @@ import VASSAL.i18n.Resources; import VASSAL.tools.swing.Dialogs; +import javax.swing.AbstractAction; +import javax.swing.JOptionPane; import java.awt.event.ActionEvent; import java.util.ArrayList; import java.util.List; -import javax.swing.AbstractAction; -import javax.swing.JOptionPane; /** * When invoked, will join a game room on the server @@ -68,6 +68,7 @@ public void actionPerformed(ActionEvent evt) { Resources.getString("Chat.vassal_configuration_error"), sb.toString(), JOptionPane.INFORMATION_MESSAGE); + return; // No game for you! Come back when you've updated... } } diff --git a/vassal-app/src/main/resources/VASSAL/i18n/VASSAL.properties b/vassal-app/src/main/resources/VASSAL/i18n/VASSAL.properties index e22899a986..5c8acdccd6 100644 --- a/vassal-app/src/main/resources/VASSAL/i18n/VASSAL.properties +++ b/vassal-app/src/main/resources/VASSAL/i18n/VASSAL.properties @@ -547,7 +547,7 @@ Chat.join_not_ok=ADVICE: %1$s is not using the same Vassal or Module versions as # Chat.vassal_configuration_error=Possible VASSAL Configuration Error Chat.join_issue=Your VASSAL or Module version does not match that of the owner of room '%1$s'. -Chat.are_you_sure=This is likely to cause problems; we strongly recommend resolving the mismatches noted below before playing. +Chat.are_you_sure=You cannot join because the game will only work correctly with matching versions. Chat.copy=Copy selected log text Chat.save_to_text_file=Save log as text file Chat.save_to_html_file=Save log as html file