Fix "No such index" display for search names of CRE resources

Argent77 · Jun 28, 2024 · a7f717d · a7f717d
1 parent dcd18c3
commit a7f717d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/org/infinity/resource/cre/CreResource.java b/src/org/infinity/resource/cre/CreResource.java
@@ -712,9 +712,11 @@ public static String getSearchString(InputStream is) throws IOException {
     if (sig.equals("CHR ")) {
       retVal = StreamUtils.readString(is, 32);
     } else {
-      String name = StringTable.getStringRef(StreamUtils.readInt(is));
-      String shortName = StringTable.getStringRef(StreamUtils.readInt(is));
-      if (name.equals(shortName)) {
+      final int strrefName = StreamUtils.readInt(is);
+      final int strrefShortName = StreamUtils.readInt(is);
+      final String name = StringTable.getStringRef(strrefName).trim();
+      final String shortName = StringTable.getStringRef(strrefShortName).trim();
+      if (strrefName == strrefShortName || strrefShortName < 0 || name.equals(shortName) || shortName.isEmpty()) {
         retVal = name;
       } else {
         retVal = name + " - " + shortName;