diff --git a/src/main/java/jace/config/Configuration.java b/src/main/java/jace/config/Configuration.java index fdd6835..ee4de17 100644 --- a/src/main/java/jace/config/Configuration.java +++ b/src/main/java/jace/config/Configuration.java @@ -284,7 +284,7 @@ public class Configuration implements Reconfigurable { // System.out.println("Evaluating field " + f.getName()); try { Object o = f.get(node.subject); - if (!f.getType().isPrimitive() && visited.contains(o)) { + if (!f.getType().isPrimitive() && f.getType() != String.class && visited.contains(o)) { continue; } visited.add(o); diff --git a/src/main/java/jace/hardware/CardDiskII.java b/src/main/java/jace/hardware/CardDiskII.java index 97e8af5..a7e3bd7 100644 --- a/src/main/java/jace/hardware/CardDiskII.java +++ b/src/main/java/jace/hardware/CardDiskII.java @@ -56,7 +56,7 @@ public class CardDiskII extends Card implements Reconfigurable, MediaConsumerPar static public boolean USE_MAX_SPEED = true; @ConfigurableField(category = "Disk", defaultValue = "", shortName = "d1", name = "Drive 1 disk image", description = "Path of disk 1") public String disk1; - @ConfigurableField(category = "Disk", defaultValue = "", shortName = "d2", name = "Drive 2 disk image", description = "Path of disk 1") + @ConfigurableField(category = "Disk", defaultValue = "", shortName = "d2", name = "Drive 2 disk image", description = "Path of disk 2") public String disk2; public CardDiskII(Computer computer) {