jshell: run cleanups on the client thread

2021-07-16 15:52:57 -06:00
parent 48c6434e6d
commit de8940b8b9
1 changed files with 16 additions and 11 deletions
--- a/runelite-jshell/src/main/java/net/runelite/jshell/ShellPanel.java
+++ b/runelite-jshell/src/main/java/net/runelite/jshell/ShellPanel.java
@@ -419,7 +419,12 @@ public abstract class ShellPanel extends JPanel

 	private void cleanup()
 	{
-		for (var c : cleanup)
+		var todo = new ArrayList<>(cleanup);
+		cleanup.clear();
+
+		invokeOnClientThread(() ->
+		{
+			for (var c : todo)
 			{
 				try
 				{
@@ -430,7 +435,7 @@ public abstract class ShellPanel extends JPanel
 					shellLogger.error("Cleanup threw:", e);
 				}
 			}
-		cleanup.clear();
+		});
 	}

 	protected abstract void invokeOnClientThread(Runnable r);