From eb7e77defe7bd071300423d0c2c39d2507badca4 Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Fri, 6 Jan 2023 17:10:25 -0500
Subject: [PATCH] Test fixes

---
 .../Gui/src/main/java/resources/MultiIcon.java   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/Ghidra/Framework/Gui/src/main/java/resources/MultiIcon.java b/Ghidra/Framework/Gui/src/main/java/resources/MultiIcon.java
index 0622b1678e..c608bceb9d 100644
--- a/Ghidra/Framework/Gui/src/main/java/resources/MultiIcon.java
+++ b/Ghidra/Framework/Gui/src/main/java/resources/MultiIcon.java
@@ -21,6 +21,7 @@ import java.util.Objects;
 
 import javax.swing.Icon;
 
+import generic.theme.GIcon;
 import ghidra.util.ColorUtils;
 
 /**
@@ -171,9 +172,20 @@ public class MultiIcon implements Icon {
 			if (buffy.length() > 0) {
 				buffy.append(", ");
 			}
-			buffy.append(ResourceManager.getIconName(icon));
-		}
 
+			String name = getIconId(icon);
+			if (name == null) {
+				name = ResourceManager.getIconName(icon);
+			}
+			buffy.append(name);
+		}
 		return buffy.toString();
 	}
+
+	private String getIconId(Icon icon) {
+		if (icon instanceof GIcon gIcon) {
+			return gIcon.getId();
+		}
+		return null;
+	}
 }