From 335b44852cacc36d373e47912d746971d6c954c7 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Tue, 2 Oct 2018 01:03:34 -0600 Subject: [PATCH] runelite-client: Make Widget::isHidden only run on client thread --- .../client/plugins/bankvalue/BankValuePlugin.java | 6 +++++- .../client/plugins/motherlode/MotherlodePlugin.java | 13 ++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bankvalue/BankValuePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bankvalue/BankValuePlugin.java index 277a3cf204..5f1bde8251 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bankvalue/BankValuePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bankvalue/BankValuePlugin.java @@ -32,6 +32,7 @@ import net.runelite.api.Client; import net.runelite.api.events.GameTick; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; +import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -46,6 +47,9 @@ public class BankValuePlugin extends Plugin @Inject private Client client; + @Inject + private ClientThread clientThread; + @Inject private BankCalculation bankCalculation; @@ -61,7 +65,7 @@ public class BankValuePlugin extends Plugin @Override protected void shutDown() { - bankTitle.reset(); + clientThread.invokeLater(bankTitle::reset); } @Subscribe diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java index 5e14d64cca..402e3d0c1a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java @@ -66,6 +66,7 @@ import net.runelite.api.events.WallObjectDespawned; import net.runelite.api.events.WallObjectSpawned; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; +import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -112,6 +113,9 @@ public class MotherlodePlugin extends Plugin @Inject private Client client; + @Inject + private ClientThread clientThread; + @Getter(AccessLevel.PACKAGE) private boolean inMlm; @@ -165,10 +169,13 @@ public class MotherlodePlugin extends Plugin Widget sack = client.getWidget(WidgetInfo.MOTHERLODE_MINE); - if (sack != null && sack.isHidden()) + clientThread.invokeLater(() -> { - sack.setHidden(false); - } + if (sack != null && sack.isHidden()) + { + sack.setHidden(false); + } + }); } public MotherlodeSession getSession()