From e05b45b841fde8ec2ac862638f67ad5d9c28a7fc Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Tue, 22 Sep 2020 16:04:54 -0400
Subject: [PATCH] Fixed errant underscore in program options menu item

---
 .../main/java/docking/action/MenuData.java    | 10 ++-----
 .../java/docking/action/MenuDataTest.java     | 27 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/Ghidra/Framework/Docking/src/main/java/docking/action/MenuData.java b/Ghidra/Framework/Docking/src/main/java/docking/action/MenuData.java
index 8d125c21fc..c3a0d8c49d 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/action/MenuData.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/action/MenuData.java
@@ -218,10 +218,7 @@ public class MenuData {
 		}
 		MenuData oldData = cloneData();
 		menuPath = processMenuPath(newPath);
-		int newMnemonic = getMnemonic(newPath);
-		if (newMnemonic != NO_MNEMONIC) {
-			mnemonic = newMnemonic;
-		}
+		mnemonic = getMnemonic(newPath);
 		firePropertyChanged(oldData);
 	}
 
@@ -239,10 +236,7 @@ public class MenuData {
 		MenuData oldData = cloneData();
 		menuPath = menuPath.clone();
 		menuPath[menuPath.length - 1] = processedMenuItemName;
-		int newMnemonic = getMnemonic(newMenuItemName);
-		if (newMnemonic != NO_MNEMONIC) {
-			mnemonic = newMnemonic;
-		}
+		mnemonic = getMnemonic(newMenuItemName);
 		firePropertyChanged(oldData);
 	}
 
diff --git a/Ghidra/Framework/Docking/src/test/java/docking/action/MenuDataTest.java b/Ghidra/Framework/Docking/src/test/java/docking/action/MenuDataTest.java
index 5cc98e9151..ad6ada3eaa 100644
--- a/Ghidra/Framework/Docking/src/test/java/docking/action/MenuDataTest.java
+++ b/Ghidra/Framework/Docking/src/test/java/docking/action/MenuDataTest.java
@@ -59,6 +59,31 @@ public class MenuDataTest {
 	 */
 	@Test(expected = IllegalArgumentException.class)
 	public void testBreakMenuPath2() {
-		MenuData menuData = new MenuData(new String[] {});
+		new MenuData(new String[] {});
+	}
+
+	@Test
+	public void testSetMenuItemName() {
+
+		MenuData menuData = new MenuData(new String[] { "One", "Two", "T&hree" });
+		assertEquals("Three", menuData.getMenuItemName());
+		assertEquals(menuData.getMnemonic(), 'h');
+
+		String newName = "Completely New Name";
+		menuData.setMenuItemName(newName);
+		assertEquals(menuData.getMnemonic(), MenuData.NO_MNEMONIC);
+	}
+
+	@Test
+	public void testSetMenuPath() {
+
+		MenuData menuData = new MenuData(new String[] { "One", "Two", "T&hree" });
+		assertEquals("Three", menuData.getMenuItemName());
+		assertEquals(menuData.getMnemonic(), 'h');
+
+		String newName = "Completely New Name";
+		String[] newPath = { "Four", newName };
+		menuData.setMenuPath(newPath);
+		assertEquals(menuData.getMnemonic(), MenuData.NO_MNEMONIC);
 	}
 }