From aa403a9b57d29d422bec9ff2ace8b94b3a82d8fb Mon Sep 17 00:00:00 2001
From: 7ate9 <7ate9@users.noreply.github.com`>
Date: Fri, 5 Jul 2019 12:04:10 -0400
Subject: [PATCH] menumanager: fix slow swaps

---
 .../net/runelite/client/menus/MenuManager.java   | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
index e4052bc110..8b228280be 100644
--- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
@@ -287,6 +287,11 @@ public class MenuManager
 			return;
 		}
 
+		rebuildLeftClickMenu();
+	}
+
+	private void rebuildLeftClickMenu()
+	{
 		entries.clear();
 		entries.addAll(Arrays.asList(client.getMenuEntries()));
 
@@ -428,10 +433,15 @@ public class MenuManager
 	@Subscribe
 	public void onMenuOptionClicked(MenuOptionClicked event)
 	{
-		if (!client.isMenuOpen() && leftClickEntry != null)
+		if (!client.isMenuOpen())
 		{
-			event.setMenuEntry(leftClickEntry);
-			leftClickEntry = null;
+			rebuildLeftClickMenu();
+
+			if (leftClickEntry != null)
+			{
+				event.setMenuEntry(leftClickEntry);
+				leftClickEntry = null;
+			}
 		}
 
 		if (event.getMenuAction() != MenuAction.RUNELITE)