From 26dc7b62b7bfa993c4749bcdb2dccedc348c013a Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Wed, 9 Jun 2021 14:59:37 -0400
Subject: [PATCH] Test fixes for intermittent key binding options failure

---
 .../framework/plugintool/dialog/KeyBindingUtilsTest.java      | 4 +++-
 .../docking/widgets/filechooser/FileChooserActionManager.java | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/framework/plugintool/dialog/KeyBindingUtilsTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/framework/plugintool/dialog/KeyBindingUtilsTest.java
index 115384ffe0..e35539746d 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/framework/plugintool/dialog/KeyBindingUtilsTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/framework/plugintool/dialog/KeyBindingUtilsTest.java
@@ -514,9 +514,11 @@ public class KeyBindingUtilsTest extends AbstractGhidraHeadedIntegrationTest {
 
 	private void selectRowForAction(DockingActionIf action) throws Exception {
 		String actionName = action.getName();
+		String owner = action.getOwnerDescription();
 
 		for (int i = 0; i < model.getRowCount(); i++) {
-			if (actionName.equals(model.getValueAt(i, 0))) {
+			if (actionName.equals(model.getValueAt(i, 0)) &&
+				owner.equals(model.getValueAt(i, 2))) {
 				final int idx = i;
 				SwingUtilities.invokeAndWait(() -> {
 					table.setRowSelectionInterval(idx, idx);
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/FileChooserActionManager.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/FileChooserActionManager.java
index 4d0f614eaa..de66ea0045 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/FileChooserActionManager.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/FileChooserActionManager.java
@@ -44,7 +44,7 @@ class FileChooserActionManager {
 	}
 
 	private void createActions() {
-		renameAction = new DockingAction("Rename", OWNER) {
+		renameAction = new DockingAction("Rename", OWNER, false) {
 
 			@Override
 			public void actionPerformed(ActionContext context) {
@@ -87,7 +87,7 @@ class FileChooserActionManager {
 		renameAction.markHelpUnnecessary();
 		chooser.addAction(renameAction);
 
-		removeRecentAction = new DockingAction("Remove Recent", OWNER) {
+		removeRecentAction = new DockingAction("Remove Recent", OWNER, false) {
 
 			@Override
 			public void actionPerformed(ActionContext context) {