Merge pull request #12791 from Cattlesquat/12784

12784 - unbreak Text Label images referenced via https:// etc
vassalengine · Oct 8, 2023 · f212bc1 · f212bc1
2 parents d523792 + f129b82
commit f212bc1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/vassal-app/src/main/java/VASSAL/counters/Labeler.java b/vassal-app/src/main/java/VASSAL/counters/Labeler.java
@@ -618,7 +618,8 @@ public BufferedImage eval() throws Exception {
 
       // paint the foreground
       if (fg != null) {
-        if (txt.contains("<img")) { //NON-NLS
+        // Support images pre-existing in the module
+        if (txt.contains("<img") && !txt.contains("src=\"http://") && !txt.contains("src=\"https://") && !txt.contains("src=\"file://")) { //NON-NLS
           final DataArchiveTextPane p = new DataArchiveTextPane(txt, "label", fg, font); //NON-NLS
           p.paint(g);
         }