From c6404f4dc6be2799a72c9980707dff450c474106 Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Wed, 18 Aug 2021 14:12:36 -0400
Subject: [PATCH] GP-1217 - fixed stack trace when using keyboard shortcuts in
 a combo box popup menu

---
 .../src/main/java/docking/menu/keys/MenuKeyHandler.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Ghidra/Framework/Docking/src/main/java/docking/menu/keys/MenuKeyHandler.java b/Ghidra/Framework/Docking/src/main/java/docking/menu/keys/MenuKeyHandler.java
index fd4d9dbfd3..d3386e6de8 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/menu/keys/MenuKeyHandler.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/menu/keys/MenuKeyHandler.java
@@ -169,6 +169,9 @@ abstract class MenuKeyHandler {
 		}
 
 		int itemCount = getItemCount(popup);
+		if (itemCount == 0) {
+			return -1;
+		}
 
 		// handle wrapping around to the top again
 		int updatedOffset = offset >= itemCount ? offset % itemCount : offset;